[Kst] extragear/graphics/kst/src
Barth Netterfield
netterfield at astro.utoronto.ca
Mon Feb 5 16:28:48 CET 2007
SVN commit 630503 by netterfield:
Some UI tweaks...
As requested (IIRC), all selection boxes are now 'extended' mode.
Also, as an experiment, use labels rather than icons in the data wizard
2nd page for the select and remove buttons, so that the keyboard
accelerators work. I don't know why they don't work with icons...
M +1 -1 kst/Makefile.am
M +3 -3 libkstapp/changefiledialog.ui
M +4 -4 libkstapp/changenptsdialog.ui
M +2 -2 libkstapp/datawizard.ui
M +2 -2 libkstapp/datawizard.ui.h
M +10 -8 libkstapp/vectorsavedialog.ui
M +7 -4 widgets/editmultiplewidget.ui
M +1 -1 widgets/vectorselector.ui.h
--- trunk/extragear/graphics/kst/src/kst/Makefile.am #630502:630503
@@ -7,7 +7,7 @@
kst_SOURCES = main.cpp
kst_LDADD = ../libkstapp/libkstapp.la
-kst_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+kst_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
KDE_ICON = kst
--- trunk/extragear/graphics/kst/src/libkstapp/changefiledialog.ui #630502:630503
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>KstChangeFileDialog</class>
<widget class="QDialog">
<property name="name">
@@ -8,7 +8,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>487</width>
+ <width>488</width>
<height>600</height>
</rect>
</property>
@@ -88,7 +88,7 @@
</sizepolicy>
</property>
<property name="selectionMode">
- <enum>Multi</enum>
+ <enum>Extended</enum>
</property>
<property name="whatsThis" stdset="0">
<string>The source file for the vectors selected in this list will be changed.</string>
--- trunk/extragear/graphics/kst/src/libkstapp/changenptsdialog.ui #630502:630503
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>KstChangeNptsDialog</class>
<widget class="QDialog">
<property name="name">
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>497</width>
- <height>291</height>
+ <width>502</width>
+ <height>295</height>
</rect>
</property>
<property name="caption">
@@ -82,7 +82,7 @@
<cstring>CurveList</cstring>
</property>
<property name="selectionMode">
- <enum>Multi</enum>
+ <enum>Extended</enum>
</property>
<property name="whatsThis" stdset="0">
<string>The sample ranges for the vectors selected in this list will be changed.</string>
--- trunk/extragear/graphics/kst/src/libkstapp/datawizard.ui #630502:630503
@@ -288,7 +288,7 @@
</sizepolicy>
</property>
<property name="text">
- <string></string>
+ <string>&Select</string>
</property>
<property name="whatsThis" stdset="0">
<string>Select (Alt-s): Move highlighted fields from the Available data list to the Selected data list for plotting.</string>
@@ -307,7 +307,7 @@
</sizepolicy>
</property>
<property name="text">
- <string></string>
+ <string>&Remove</string>
</property>
<property name="whatsThis" stdset="0">
<string>Remove (Alt-s): Move highlighted fields from the Selected data list to the Available data list so that they will not be plotted.</string>
--- trunk/extragear/graphics/kst/src/libkstapp/datawizard.ui.h #630502:630503
@@ -59,8 +59,8 @@
_up->setPixmap(BarIcon("up"));
_down->setPixmap(BarIcon("down"));
- _add->setPixmap(BarIcon("forward"));
- _remove->setPixmap(BarIcon("back"));
+ //_add->setPixmap(BarIcon("forward"));
+ //_remove->setPixmap(BarIcon("back"));
loadSettings();
QToolTip::add(_up, i18n("Raise in plot order: Alt+Up"));
--- trunk/extragear/graphics/kst/src/libkstapp/vectorsavedialog.ui #630502:630503
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>VectorSaveDialog</class>
<widget class="QDialog">
<property name="name">
@@ -30,7 +30,7 @@
<cstring>_vectorList</cstring>
</property>
<property name="selectionMode">
- <enum>Multi</enum>
+ <enum>Extended</enum>
</property>
</widget>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
@@ -111,6 +111,8 @@
</widget>
</grid>
</widget>
+<customwidgets>
+</customwidgets>
<connections>
<connection>
<sender>pushButton2</sender>
@@ -137,6 +139,12 @@
<slot>save()</slot>
</connection>
</connections>
+<tabstops>
+ <tabstop>_vectorList</tabstop>
+ <tabstop>_multiOptions</tabstop>
+ <tabstop>_saveButton</tabstop>
+ <tabstop>pushButton2</tabstop>
+</tabstops>
<includes>
<include location="global" impldecl="in implementation">kdeversion.h</include>
<include location="global" impldecl="in implementation">kfiledialog.h</include>
@@ -155,12 +163,6 @@
<slot>init()</slot>
<slot access="private">selectionChanged()</slot>
</slots>
-<tabstops>
- <tabstop>_vectorList</tabstop>
- <tabstop>_multiOptions</tabstop>
- <tabstop>_saveButton</tabstop>
- <tabstop>pushButton2</tabstop>
-</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
--- trunk/extragear/graphics/kst/src/widgets/editmultiplewidget.ui #630502:630503
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>EditMultipleWidget</class>
<widget class="QWidget">
<property name="name">
@@ -12,6 +12,9 @@
<height>506</height>
</rect>
</property>
+ <property name="caption">
+ <string>EditMultipleWidget</string>
+ </property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
@@ -37,7 +40,7 @@
<cstring>_objectList</cstring>
</property>
<property name="selectionMode">
- <enum>Multi</enum>
+ <enum>Extended</enum>
</property>
</widget>
<widget class="QLayoutWidget" row="0" column="2" rowspan="2" colspan="1">
@@ -148,13 +151,13 @@
</tabstops>
<includes>
<include location="global" impldecl="in implementation">qregexp.h</include>
+ <include location="global" impldecl="in declaration">kst_export.h</include>
<include location="local" impldecl="in implementation">editmultiplewidget.ui.h</include>
- <include location="global" impldecl="in declaration">kst_export.h</include>
</includes>
-<exportmacro>KST_EXPORT</exportmacro>
<slots>
<slot>selectAllObjects()</slot>
<slot>applyFilter( const QString & filter )</slot>
</slots>
+<exportmacro>KST_EXPORT</exportmacro>
<layoutdefaults spacing="6" margin="11"/>
</UI>
--- trunk/extragear/graphics/kst/src/widgets/vectorselector.ui.h #630502:630503
@@ -145,7 +145,7 @@
}
if (pro) {
pro->readLock();
- pro->showDialog(true);
+ pro->showDialog(false);
pro->unlock();
} else {
KstDialogs::self()->showVectorDialog(_vector->currentText(), true);
More information about the Kst
mailing list