Commit Graph

4987 Commits

Author SHA1 Message Date
Thomas Hartmann
6f51d76cd4 WelcomePage: Taking text sizes into account for layout
Buttons do not have a fixed width of 160px anymore
and the sidebar layout becomes dynamic.

Task-number: QTCREATORBUG-12108
Task-number: QTCREATORBUG-12091
Change-Id: I940b4b7c9c79a312766501559147abb85833b78f
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-23 14:30:47 +02:00
Marco Bubke
cc68534e06 QmlDesigner: More quadratic size of item library delegates
Change-Id: Ie16f486fbe873fbec6663ac965e244c59c0e0e6b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 14:10:33 +02:00
Tim Jenssen
5df2389970 QmlDesigner: rewrite itemlibrary
Change-Id: I31344f7cfa56ae5dd6662bef4e449007b7ec3ec4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:07:47 +02:00
Tim Jenssen
1da0d018c2 QmlDesigner: prepare Sections for use as a delegate
Change-Id: Ieeddea3d813f13cb7018d6611156f1f98b69e6be
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:07:29 +02:00
Tim Jenssen
30780640ad QmlDesigner: remove ugly pixel line from scrollbar
Change-Id: Ib553128667a85abadfe9b810860b0f7a68499bed
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:06:57 +02:00
Pavel Fric
a0ca5f645d Update Czech translation
Change-Id: I1531b1362628916c5f992a69254db0b47e028759
Reviewed-by: Vojtech Kral <vojtech@kral.hk>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-06-19 16:57:23 +02:00
hjk
9968271d3f Debugger: Streamline gdb.Value field access workarounds
Change-Id: I1b3b81019f6861353e5ada350fadbe3c8734f186
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-19 14:14:16 +02:00
Tim Jenssen
115620aabc QmlDesigner: cleanup unused methods
- remove javascript methods: scrollView(delta), resetView()
 - remove javascript related signals
 - remove visibleCount debug output

Change-Id: I63b0a204d7f570986e41fc9fb3762f13e5d63d79
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-18 16:53:51 +02:00
Tim Jenssen
a850dc2033 QmlDesigner: move ScrollViewStyle to common directory
Change-Id: Ieb235aab921bd5d246403ff42b4659090c8abdbf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-18 16:53:34 +02:00
Thomas Hartmann
95bcd0883f QmlDesigner.PropertyEditor: Fix TextEditSpecifics
I moved the property format into Text section, because
having two sections with even the same name was confusing.
The format property also is not really related to "Text Input".

Since the distinction between plain and rich text is very important,
it makes sense to have this property in the first section.

Change-Id: I4d66ed4a24fe0d99d394c17d149c830db2c6d3b8
Task-number: QTCREATORBUG-12452
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 16:41:34 +02:00
Marco Bubke
59e4bc9112 QmlDesigner: Add PuppetAlive command
The puppet can be dead but we don't now. Now the puppet is sending a alive
signal. If the signal is not arriving anymore we restart the puppets.

Task-number: QTCREATORBUG-12434
Change-Id: I90edab6a45f95950fd764adcb125068659d5354b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 15:00:12 +02:00
Eike Ziller
514087487d Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2014-06-18 14:25:03 +02:00
Eike Ziller
cbf4de0315 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: I1bad0c1477d7fd6996c0f8ca82e76ba521bc0dcc
2014-06-18 14:20:58 +02:00
Marco Bubke
854a0f25a1 QmlDesigner: Fix recursive all item function
Change-Id: I074201639a9fcac40d9c3ca4bb50be46edb88957
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 13:30:00 +02:00
Marco Bubke
6cee8a42ff QmlDesigner: Add test if the instance exists
Change-Id: I03f7e32aa0eda1f493c24ba174c706f4b8b0442c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 13:08:41 +02:00
Marco Bubke
029cd279c3 QmlDesigner: Don't try to access invalid node instances
Task-number: QTCREATORBUG-12444
Change-Id: I021e9669137de51c8feb0d7227d6d4c65a4d710c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 13:08:34 +02:00
Marco Bubke
87e518ab53 QmlDesigner: Improve NodeInstanceServer::hasInstance
Test if instance is valid.

Change-Id: I748f3f95a2ad0669899e8029fdde4de0658ad11b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 13:08:26 +02:00
hjk
e3979fe09d Debugger: Make dumper work with GDB 7.7
GDB 7.7 changed behavior e.g. for the names of anonymous fields,
we need to adjust dumpers and some tests.

Change-Id: I25ae32cc56c4ff63b677a04d6ed9c250e0252140
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-18 12:17:42 +02:00
Eike Ziller
232024253f Examples: Support new mainFile attribute
Qt 5.3 adds a mainFile="yes" attribute to the fileToOpen tag for the
file that should be visible after opening the files.

Change-Id: I3ff67e514a16811cc730633e0fbcc470c4e54e5e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-17 16:48:05 +02:00
Thomas Hartmann
594b184bb1 QmlDesigner.PropertyEditor: Fixing size of ScrollArea
When evaluating Component.onCompleted the childrenRect.height
was not properly set, yet.

Instead we use onChildRectHeightChanged.

Change-Id: I68f395555fbfccccea35fab4387dcc23ca7f1a92
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-17 11:33:14 +02:00
hjk
a63ed31b9b Debugger: Fix base class name printing for GDB/CLI
Change-Id: Ib007c9d0035387018acd608d67d4a9632c17ab8b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-17 09:04:41 +02:00
hjk
e483ae53ec Debugger: Better putAddressRange fallback
Change-Id: I401d7c184465c117cf4506f55fc911766d41052e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-17 08:56:24 +02:00
hjk
b51ec79f7c Debugger: Remove some debugging output
Change-Id: I4df8bd423bfce6b3005c5821ea71358a8ac260ea
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-17 07:42:21 +02:00
hjk
fffbf9472a Debugger: Make dumpers somewhat work in command line GDB
With

    python sys.path.insert(1, '/data/dev/creator/share/qtcreator/debugger/')
    python from gdbbridge import *

in .gdbinit there's a new "GDB command", called "pp".

With code like

    int main(int argc, char *argv[])
    {
        QString ss = "Hello";
        QApplication app(argc, argv);
        app.setObjectName(ss);
        // break here
    }

the 'pp' command can be used as follows:

(gdb) pp app
app =
   [
      <Myns::QGuiApplication> = {"Hello"}
      staticMetaObject = <Myns::QMetaObject> = {""}
      [parent] = <Myns::QObject *> = {"0x0"}
      [children] = <Myns::QObjectList> = {"<3 items>"}
      [properties] = "<>0 items>"
      [methods] = "<6 items>"
      [signals] = "<1 items>"
   ],<Myns::QApplication> = {"Hello"}

(gdb) pp app [properties],[children]
app =
   [
      <Myns::QGuiApplication> = {"Hello"}
      staticMetaObject = <Myns::QMetaObject> = {""}
      [parent] = <Myns::QObject *> = {"0x0"}
      [children] = [
         <Myns::QObject> = {""}
         <Myns::QObject> = {""}
         <Myns::QObject> = {"fusion"}
      ],<Myns::QObjectList> = {"<3 items>"}
      [properties] = [
         windowIcon = <Myns::QVariant (QIcon)> = {""}
         cursorFlashTime = <Myns::QVariant (int)> = {"1000"}
         doubleClickInterval = <Myns::QVariant (int)> = {"400"}
         keyboardInputInterval = <Myns::QVariant (int)> = {"400"}
         wheelScrollLines = <Myns::QVariant (int)> = {"3"}
         globalStrut = <Myns::QVariant (QSize)> = {"(0, 0)"}
         startDragTime = <Myns::QVariant (int)> = {"500"}
         startDragDistance = <Myns::QVariant (int)> = {"10"}
         styleSheet = <Myns::QVariant (QString)> = {""}
         autoSipEnabled = <Myns::QVariant (bool)> = {"true"}
      ],"<10 items>"
      [methods] = "<6 items>"
      [signals] = "<1 items>"
   ],<Myns::QApplication> = {"Hello"}

(gdb) pp ss
ss =
   <Myns::QString> = {"Hello"}

Change-Id: I6e4714a5cfe34c38917500d114ad9a70d20cff39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-16 16:28:59 +02:00
hjk
ff2c4a28f2 Debugger: Add dumper for QStringData, QHashedString and QQmlRefCount
Change-Id: I252f532d2f67519ebc1ea45353579408bee91c59
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-16 15:01:09 +02:00
Thomas Hartmann
f3270472ee QmlDesigner.NodeInstances: blacklist QtMultimedia/Audio
Change-Id: I7d16ae74ea848e848ac6dc2d8c8bb9c468681889
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-12 18:07:03 +02:00
Tim Jenssen
ef87889b63 QmlDesigner: add reload feature to item library view
Change-Id: Ib71dc235abd059056063c5d9b9072c8bdc932762
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 14:13:22 +02:00
Thomas Hartmann
94887ce539 QmlDesigner.StatesEditor: Fixing capitalization of qml file
Change-Id: Idb6e2bcb787a8ff3b5d26330a1ced1f930f0bc1d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-11 14:12:34 +02:00
Tim Jenssen
515c77e8d7 QmlDesigner: move the beauty bottom rect inside the scrollview
Change-Id: I3cb85c6d7e9e259db7f4af28083d53539e5631b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 13:11:43 +02:00
Thomas Hartmann
c5dad0f638 QmlDesigner.StatesEditor: Adding context menu to collapse the view
Change-Id: I5c118281ec8b9b3ef059e668ed4f534b70f952e1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-06 15:31:57 +02:00
Thomas Hartmann
6d1ae0e268 QmlDesigner.StatesEditor: Small adjustments to styling
Fine tuning of the styling and some minor adjustments.
The TextFields for the state names are always visible now.

Change-Id: I617085bb08fd4bb0e926610b1c3f3020db3c68a8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-06 15:31:52 +02:00
Thomas Hartmann
33f5be4c08 QmlDesigner.PropertyEditor: Use QmlModelNodeProxy in FileResourcesModel
Before the code was abusing the anchoring backend.

Change-Id: I716c5cfa7a5c72d500cb5ae8c943c52f84c60e91
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-05 15:22:04 +02:00
Marco Bubke
785f98b98a QmlDesigner: Fix margin in the states list
Change-Id: I322dea23a598d7069e672920cb494eea8e697495
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-05 14:28:09 +02:00
hjk
a216d5445f Debugger: Fix operation with python 2.6
Change-Id: Iecfea8f6e1531228fd6cccc424ee4c6c2036098e
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2014-06-04 14:35:31 +02:00
hjk
d57bb24354 Debugger: Better fall back for LLDB without remote support
Change-Id: I517052bb795674d4beda05e3909dc05afc99bfe3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-03 17:07:03 +02:00
hjk
60f5b5afc5 Debugger: Fail more gracefully on "ill" LLDB engines
Less need to use the hard Debug->Abort

Change-Id: Ib019792063924549ace58a63ccef994dbfaa00dc
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-03 17:06:43 +02:00
hjk
be25be4705 Debugger: Better handling of the tabbed extra views
Closing with the [x] now resets the Display mode of the associated
iname, and the view hides if there are no visible tabs left.
Also, remove the long-unused DisplayProcess format.

Change-Id: Ibd3308549af75e345c672c07f6714d26e7196e5a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-03 10:53:01 +02:00
Eike Ziller
37ab6e6d03 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/shared/qbs

Change-Id: Ie56c48d3bcd42e1a15832c5e7a10fe69c5410d90
2014-06-02 12:22:03 +02:00
hjk
a9e1eef089 Debugger: Limit QObject name dumper to a more-than reasonable maximum
GDB can crash on to big chunks. Since this here is a convenience
feature only, hard-limiting it to length 200 seems ok as work-around.

Task-number: QTCREATORBUG-12330
Change-Id: Ia6ebf16f3528d91020d19851641f42c1e421fe15
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-30 13:34:25 +02:00
hjk
252048ef01 Debugger: Make char * displayable in separate windows
Task-number: QTCREATORBUG-7313
Change-Id: I8d475dd94a48e7a1d5efe4c2c0d90cb6bdf9b3e2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-28 15:07:59 +02:00
Eike Ziller
7c34567cb2 Merge remote-tracking branch 'origin/3.1' 2014-05-28 11:03:18 +02:00
Tobias Hunger
e5bef06d6e Wizards: Use configured extensions for c++ sources and headers
Task-number: QTCREATORBUG-12309
Change-Id: I3d6ebe84408427b5a4e499a6d38ef5f37711610e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-27 15:39:38 +02:00
Daniel Teske
7e8a945e6e Html5Wizard: Remove it
This wizard is from a different era. Nowadays webkit is on the way
towards deprecation and the replacement isn't ready yet.

Change-Id: Ifac9a42463562fefaa4a33eb7be2a09e0d8af1aa
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-27 10:04:41 +02:00
El Mehdi Fekari
03ffc4eaf5 QNX: Use one single bar descriptor when deploying
No more generated bar descriptor file. The default bar descriptor
should be the same one used when packaging and all changes
should be visible to the user.

Change-Id: Ib0eb1dc2ad2d49e159fa1b6009bac2e0d2569c5a
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-05-26 14:05:54 +02:00
Thomas Hartmann
e518074a4b QmlDesigner.PropertyEditor: Allow "manual mapping" in combo box
Sometimes there is no trivial mapping between model and values.

Change-Id: I2617f14828b97ba7352aa3a8f3d2ebb9fd2f3809
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-23 17:37:34 +02:00
Christian Stenger
8c353f998e Dumper: Fix missing parameter
Change-Id: Ia75c9d07967d0013f9a351e99757c0acb661d877
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-22 16:34:59 +02:00
Thomas Hartmann
b5559e73f4 QmlDesigner.PropertyEditor: Use selectionToBeChanged in LineEdit
Commit any data to the backend if the selection will change.
The signal editingFinished is usually triggered to late.

Change-Id: Ib7adfd32a50ae94b017a7587e81721176440a988
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-22 15:38:31 +02:00
Thomas Hartmann
10e2a046da QmlDesigner.PropertyEditor: Adding dirty flag to LineEdit
This patch ensures that we only commit data to the backend
if the text actually changed. The signal onEditingFinished is triggered
even if the user did not edit the string.

Change-Id: I2d54f3d79a1c60525e4c9744b364cc014bd407ce
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-22 15:38:11 +02:00
Tim Jenssen
f1795d9748 QmlDesigner: styling stateslistview
Change-Id: I29d39230bd1f37cb3d57b14045717d893f51e122
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-22 14:59:44 +02:00
Tim Jenssen
2659a9b7fd QmlDesigner: fix stateslistview sizeHint
Change-Id: I86147f80a81ff9095c67bcb296488a2a7345434a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-22 14:59:18 +02:00