Commit Graph

140 Commits

Author SHA1 Message Date
Leena Miettinen
ae72d4f88a Doc: edit vcsbase docs
Remove \brief for \enum and \fn commands.
Use standard wording. Edit for style and grammar.

Change-Id: I338567241ddc7f90feaaf058dcd4dc9afdb8ca93
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-10 16:36:44 +02:00
Orgad Shaneh
d31efc22e8 VCS: Stop on file pattern when building a chunk
Task-number: QTCREATORBUG-9782
Change-Id: I0e50c5c2696ad9cfe4e8a56c28cb17a2ee039b4f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 12:50:40 +02:00
Orgad Shaneh
20e9b33741 VCS: Use relative path for apply/revert chunk
Task-number: QTCREATORBUG-9715

Change-Id: I3bfaea3922ace396230ef5e215712a9f3459808b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-03 13:34:38 +02:00
Leena Miettinen
41411165ba Doc: use standard wording in \brief commands
QDoc does some magic with the \class and \namespaces
and \brief commands, so the following wording must be used:
"The xxx class yyy ..."

Change-Id: Id231f30e8464898b776888d5423523de404aae34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-20 11:22:47 +02:00
Eike Ziller
7c8db79817 Switch less often to edit mode
This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used

One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.

Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-05 09:43:14 +02:00
Orgad Shaneh
a91219c636 VCS: Fix context menu for custom editors
Change-Id: I44718dce73bbcd376d90fdf40f4bb5ab4c57443a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:40:50 +02:00
Orgad Shaneh
05a6fc48ba Git: Support change links on commit editor
Useful for commit messages with "reverts <hash>" for example.

Can later be extended for interactive rebase

Change-Id: Ibf77433ecddfacbd8d443636ddbc406bda474aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 14:53:02 +02:00
hjk
daad8e238e Editors: Provide a base implementation for duplicate{,Supported}
Helps avoiding trivial re-implementations.

Change-Id: Iaa2e6b92503a2b9553432568c2047c28899c7ea6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 14:27:16 +02:00
Orgad Shaneh
a9d9d44494 VCS: Rename RegularCommandOutput to OtherContent
Change-Id: I37d47c79f0efaf51eb5afd1fe529aacfadff8ee1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:29:34 +02:00
jkobus
ed1bbafad9 Fix typo inside comment
Change-Id: Ida0d5489b0c4890afd625be405a2fabdb6bc6748
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-23 11:01:19 +02:00
hjk
fe29d6a8a3 Core: Remove Core::Id(QByteArray) constructor
This was mostly used to disambiguate the char * and the QString
constructors.

Change-Id: Ib6923ef8e8c0e5d514a883e73aa001a1cd9fb534
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-04 16:47:59 +02:00
Friedemann Kleint
959a75d65e Clean headers in vcsbase-plugin.
Change-Id: Ibbfd5e0b07b2a06d17f4e3360511d7ad13b49f55
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-26 12:30:36 +01:00
Friedemann Kleint
281b2332d2 Fix Krazy warnings about includes/header guards in version control.
Change-Id: I75f2040e9b3dd5d9786faf2e829ec808af7f1304
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-12 13:56:47 +01:00
Orgad Shaneh
d1e2e20f71 Vcs: Fix crash
Task-number: QTCREATORBUG-8775

Change-Id: Id17b439202f5394b1fdb7d38c28c8048dee25d71
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-18 11:08:03 +01:00
Tobias Hunger
83d6e81d94 Vcs: Remove "waiting for data" when process fails
Task-number: QTCREATORBUG-7946

Change-Id: Ic3c3ceddd3b4bf115a1da78a5b5e5b640dbbd1f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-02-13 12:53:21 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Orgad Shaneh
8f4817152c Git: Add subject to log combobox
Change-Id: Icb76ad1c0783615172d929e8cf402feaffaddbdd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-30 10:26:58 +01:00
Orgad Shaneh
f6f822f5f6 VCS: Remove Apply/Revert Chunk when they are not applicable
Having disabled entries in a context menu without any additional
information why they are disabled is confusing

Change-Id: Idb3d5a7befe57b84adb2f7cb58b2cbc1331039ec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-30 10:26:50 +01:00
Orgad Shaneh
7cb80f0e16 VCS: Use entries combobox for log
Tests included

Change-Id: Ibe2f6ece207128f8467b0cbca9dc38f2bcd5ced6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-30 10:26:31 +01:00
Orgad Shaneh
d0f1193041 VCS: Another diff->entry rename
Change-Id: I3f4f6205f0b6e7c9a5aff0df26157686036118ba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-30 10:26:15 +01:00
Orgad Shaneh
ea33bed564 VCS: Un-static testDiffFileResolving
Change-Id: I43c40585e5ac50369422d78f74240d7249be95ae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-30 10:26:07 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Orgad Shaneh
bd31f2ad38 VCSBaseEditor: Make diffFileBrowse more generic
Log entries can also be displayed in this combo box...

Change-Id: Ibd75f436013f58d18963a675ce01a20385cc7dfd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-24 10:44:27 +01:00
Orgad Shaneh
b53d398e2c Git: Add context-menu actions for cherry-pick and revert
Change-Id: Ic266fe039423a37df2fc347ead7530322ac47bb8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 18:50:45 +01:00
Orgad Shaneh
77c606917b VCS: Be less strict when matching diff files
The provided regexps can be partial. They must match
from the beginning of the line, but matching line's
end is not required (for example, CVS pattern matches
until first tab)

Change-Id: I8fdf162aebf6d275a9ef1ed3340c0c7599eb36f8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 15:14:19 +01:00
Orgad Shaneh
64018aed8a VCS: Highlight log with diff
Change-Id: I46abd51e5764571138c54df81cc3adbeadb26840
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 14:55:02 +01:00
Orgad Shaneh
66985fa8d6 VCS: Use #ifdef WITH_TESTS instead of #if
Change-Id: I8e2003111d620c0f1708c97e6a02cbc921b031d9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-22 21:56:18 +01:00
Orgad Shaneh
7b39f41c05 VCS: Refactor fileNameFromDiffSpecification
Use diff file pattern to match file name. Avoid duplication.

Include unit tests for Git

Change-Id: Ib68a08368270a27976a3e16bdd1cb219a52b8889
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-21 12:19:55 +01:00
Orgad Shaneh
725ecc5f91 VCS: Refactor createDiffHighlighter
All plugins do the same...

Change-Id: I21e5a1d7507292add91199a3db75df74165b63b1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-18 12:43:22 +01:00
Orgad Shaneh
262b5b12c1 VCS: Capitalize change context-menu actions
Change-Id: I52f109b2826a85de73de74d7395d04d82d0e55f5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-01-15 09:44:05 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 10:48:18 +01:00
Tobias Hunger
9f3bc4ddc4 VCS: Fix diff viewer for paths with spaces
Task-number: QTCREATORBUG-8330
Change-Id: I25c8f7172f38716ab625705c4969a7685d373e4e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-12-17 17:01:42 +01:00
Orgad Shaneh
7c4e2b6c60 Id: Add QByteArray constructor
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-20 08:57:35 +01:00
Tobias Hunger
103d910aff Remove some nokia urls
Change-Id: Idfe672691b6b412074d3170c5dc5354aabb8ea05
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 10:56:19 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Leena Miettinen
a17d7d7528 UI text: fix capitalization
Change-Id: I16419b21a7414c0e97238d33c433a88233076cf5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-01 15:21:36 +02:00
Orgad Shaneh
3f74332f97 VCS: Prevent display of "Describe Change" for invalid revision
Change-Id: I0e0d3429819c4dc72071106c680e9db5d4f5cd32
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-30 23:30:05 +02:00
Orgad Shaneh
12a99d476c Git: Do not display invalid commit as blame candidate
Change-Id: Ia08775b2e4364f405d223a9b49971ae70c04965a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-26 20:57:45 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Eike Ziller
e3c354d8f2 Make PluginManager mostly static.
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-19 16:11:40 +02:00
Orgad Shaneh
671bfb9250 VCS: Always allow "Revert Chunk"
Remove revertDiffChunkEnabled property

Any diff view might relate to previous changes, so it makes sense
to always allow reverting them

Change-Id: I8da0fb2d8625ac98140d1bde0296a4478bc6a0b7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:35:07 +02:00
Orgad Shaneh
3c342a49dc VCS: Add 'Blame current revision' in blame context menu
Internal change: added decorateVersion() function for decorating
a revision. This is called for both the current version and previous ones

Change-Id: I8b23fd628c9db01b005c19d46580979c5a21c687
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:34:24 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
hjk
d006ca80a6 texteditor: use an enum instead of QString as color ids
Change-Id: I658412c18d5ccfe978ec444451c6417ffb18d71c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-03 13:11:25 +02:00
Bradley T. Hughes
fb9146a9c3 Compile after qt5/qtbase commit 75a0c7f9
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-30 14:32:08 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-17 09:53:44 +02:00
Aurélien Gâteau
7e04a679ae Fix wrong cursor in vcs log editor
When cursor leaves a change, reset its shape and remove underline on the
change.

Change-Id: Idedafefc57338a32fdaa773fc4a41c0f0527a5b8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-15 17:45:36 +01:00
Daniel Teske
5585426efc Ui: No spaces before "..."
Change-Id: Ic76ef1bea53e2cf5c2d109688247e84c1aa70f6b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-03-07 16:14:55 +01:00
Tobias Hunger
f32c418a88 VCS: Disable revision bar on annotate/log output
Task-number: QTCREATORBUG-5313

Change-Id: I3dee69028e782c6f87ea1ef8b251d944bcf9be6d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-06 15:10:42 +01:00
Tobias Hunger
4b366303e6 VCS: Make dark color schemes work with annotation highlighter
Task-number: QTCREATORBUG-6257

Change-Id: Ied01cf6773b5114100afccbac33f359cc72c0889
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-06 14:34:01 +01:00