Commit Graph

44 Commits

Author SHA1 Message Date
Eike Ziller
0855d4acfa Workaround QCompleter issue with closing its popup on escape
QCompleter doesn't close its popup if there's a application wide
'escape' shortcut.
This commit adds the necessary shortcut overrides for CompletingTextEdit
and FancyLineEdit, which fixes the issue at least for find tool bar,
advanced search, gerrit dialog and description field of submit editor.

Task-number: QTCREATORBUG-9453
Change-Id: Ib1df218ab6b9a54fbf19d6132c6edd8e83ace46c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-26 09:31:30 +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
Friedemann Kleint
aebf19eabd Clean headers in Utils.
Forward-declare QGraphicsOpacityEffect in DetailsButton,
QProcessEnvironment in Environment, QFileInfo in fileutils,
QUrl in IWelcomePage, FancyLineEdit in PathChooser and
remove unneeded headers.

Change-Id: I7d5f273530dd2059bbdaf0899f0a3bc7e49e8482
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-19 17:19:26 +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
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
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
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Orgad Shaneh
81b431cdca HistoryCompleter: Accept parent
Change-Id: Ifbbd2b7af06eec620a765614792547fff6303f06
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 16:57:13 +02:00
hjk
8d3c1cfb05 Rename FancyLineEdit::setHistoryKey -> setHistoryCompleter
similar for HistoryCompleter *m_completer -> m_historyCompleter

Change-Id: Ic7aedc19cbb865f0a5bdddb9565a7411fd06dfde
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 16:18:39 +02:00
hjk
88f5949e38 close down history completer interface
Change-Id: Iaeff40be410d1f0facd687632c9ce4897eb2e613
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-24 13:38:15 +02:00
hjk
903eeaf42f fancylineedit: enforce conscious choice between history or special completer
Change-Id: Ia667895b619d0bb37561dce348adb7269df2fb9c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-24 13:37:59 +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
Francois Ferrand
d77d8fba43 Cleanup popup menu position.
The menus on toolbuttons are not placed next to the menu, like other toolbuttons,
instead of being opened at mouse position.

The code is similar to the code in QToolButton implementation.

Change-Id: I7893b0badcd35e00d0c6a27749d2bcf0b6f1d44b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-09 11:23:16 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Daniel Teske
48f71a715a Remove left over code, state is unused since 6dc4a0
Change-Id: Ic44c62fceb64c07f1a1af6e7c8644ab526f03269
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-21 16:21:55 +02:00
hjk
28535f7571 utils, qmljstools, vcsbase: s/\bm_d\b/d/g
Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd
Reviewed-on: http://codereview.qt-project.org/4992
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-15 14:11:09 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
505256fab9 API-Documentation: Add the Utils-library.
Fix API after doc template change.
2011-03-02 17:14:19 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Friedemann Kleint
07c8186e78 Header cleanup in utils. 2010-07-02 16:42:34 +02:00
con
6dc4a039f2 Refactor fancy line edit to optionally have two buttons.
Also unify some method naming.
Use the new feature to add clear buttons to the Locator,
and the find tool bar.

Task-number: QTCREATORBUG-705
2010-07-01 10:56:00 +02:00
Jens Bache-Wiig
b3284a1e71 Fixed an issue with animated icons on fancylineedit
Using a static local here is obviously simply wrong.
This should take care of the remaining issues with broken
animation states.

Reviewed-by: danimo
2010-04-29 16:50:30 +02:00
con
3828d6b263 Icon tweaks for line edits.
Reviewed-by: Jens Bache-Wiig
2010-04-27 19:01:50 +02:00
Jens Bache-Wiig
512b312cc1 Some minor modifications to fancylineedit 2010-04-13 12:07:00 +02:00
Jens Bache-Wiig
894fd9d7b3 Improved fancylineedit and consistency
- fixed some RTL issues. I removed isSideStored
and useLayoutDirection. Instead we simply flip the
sides if RTL is in use.
- added the fader animation and clear icon that we
use in Designer already.
- fixed the double toplevel popup focus issues we
had with the locator menu.
- removed some redundant labels and reset buttons
2010-04-12 19:49:22 +02:00
dt
f71f837a74 Replace FancyLineEdit::setHintText by QLineEdit::setPlaceHolder
Reviewed-By: con
2010-03-16 12:18:40 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Robert Loehning
588b4eff59 Removed obsolete ifdefs.
Reviewed-by: dt
2010-03-02 19:53:31 +01:00
dt
2e870d3753 Fix stylesheet hack to only be used with 4.6
Note: If you are compiling with 4.6 but running against 4.7 then this
will result in a slightly buggy line edit.
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
2010-02-17 16:54:50 +01:00
Friedemann Kleint
bf73896928 SettingsDialog: Polish
Use QGridLayout to align header label and QStackedLayout for the pages
(in code, as it is not available in Designer).
Derive new class FilterLineEdit for filter widgets based on a modified
version of FancyLineEdit and use that in settings.
Rubber-stamped-by: con <qtc-committer@nokia.com>
2009-11-27 13:54:27 +01:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
hjk
f61e8672db more cosmetic changes 2008-12-02 14:09:21 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00