From: <j-...@us...> - 2009-04-17 07:23:13
|
Revision: 3319 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3319&view=rev Author: j-b-m Date: 2009-04-17 07:23:11 +0000 (Fri, 17 Apr 2009) Log Message: ----------- Remove useless strings from uifiles, patch by Laurent Montel Modified Paths: -------------- trunk/kdenlive/src/widgets/dvdwizardiso_ui.ui trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui Modified: trunk/kdenlive/src/widgets/dvdwizardiso_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardiso_ui.ui 2009-04-16 14:45:55 UTC (rev 3318) +++ trunk/kdenlive/src/widgets/dvdwizardiso_ui.ui 2009-04-17 07:23:11 UTC (rev 3319) @@ -9,9 +9,6 @@ <height>81</height> </rect> </property> - <property name="windowTitle" > - <string>Form</string> - </property> <layout class="QGridLayout" name="gridLayout" > <item row="0" column="0" > <widget class="QLabel" name="label" > Modified: trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui 2009-04-16 14:45:55 UTC (rev 3318) +++ trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui 2009-04-17 07:23:11 UTC (rev 3319) @@ -9,9 +9,6 @@ <height>451</height> </rect> </property> - <property name="windowTitle" > - <string>Form</string> - </property> <layout class="QGridLayout" name="gridLayout_5" > <item row="0" column="0" > <widget class="QCheckBox" name="create_menu" > Modified: trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2009-04-16 14:45:55 UTC (rev 3318) +++ trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2009-04-17 07:23:11 UTC (rev 3319) @@ -9,9 +9,6 @@ <height>303</height> </rect> </property> - <property name="windowTitle" > - <string>Form</string> - </property> <layout class="QGridLayout" name="gridLayout" > <item row="0" column="0" > <widget class="QListWidget" name="job_progress" > Modified: trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui 2009-04-16 14:45:55 UTC (rev 3318) +++ trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui 2009-04-17 07:23:11 UTC (rev 3319) @@ -9,9 +9,6 @@ <height>226</height> </rect> </property> - <property name="windowTitle" > - <string>Form</string> - </property> <layout class="QGridLayout" name="gridLayout_2" > <item row="0" column="0" > <widget class="QCheckBox" name="use_intro" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-12 23:13:48
|
Revision: 3381 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3381&view=rev Author: j-b-m Date: 2009-05-12 23:13:33 +0000 (Tue, 12 May 2009) Log Message: ----------- Updated .ui files for dvd chapters Modified Paths: -------------- trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui trunk/kdenlive/src/widgets/renderwidget_ui.ui Modified: trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2009-05-12 16:49:58 UTC (rev 3380) +++ trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2009-05-12 23:13:33 UTC (rev 3381) @@ -86,13 +86,13 @@ </widget> </item> <item row="0" column="3"> - <widget class="QPushButton" name="button_burn"> - <property name="enabled"> - <bool>false</bool> - </property> + <widget class="QToolButton" name="button_burn"> <property name="text"> <string>Burn</string> </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> </widget> </item> <item row="1" column="0" colspan="4"> Modified: trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui 2009-05-12 16:49:58 UTC (rev 3380) +++ trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui 2009-05-12 23:13:33 UTC (rev 3381) @@ -1,56 +1,57 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>DvdWizardVob_UI</class> - <widget class="QWidget" name="DvdWizardVob_UI" > - <property name="geometry" > + <widget class="QWidget" name="DvdWizardVob_UI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>334</width> - <height>226</height> + <height>246</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" > - <widget class="QCheckBox" name="use_intro" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QCheckBox" name="use_intro"> + <property name="text"> <string>Intro movie</string> </property> </widget> </item> - <item row="0" column="1" colspan="2" > - <widget class="KUrlRequester" name="intro_vob" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Expanding" > + <item row="0" column="1" colspan="2"> + <widget class="KUrlRequester" name="intro_vob"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="1" column="0" colspan="3" > - <widget class="QGroupBox" name="vob_list" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Maximum" hsizetype="Preferred" > + <item row="1" column="0" colspan="3"> + <widget class="QGroupBox" name="vob_list"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="title" > + <property name="title"> <string>DVD Files</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="KUrlRequester" name="vob_1" /> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="KUrlRequester" name="vob_1"/> </item> </layout> </widget> </item> - <item row="2" column="0" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="2" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>182</width> <height>37</height> @@ -58,26 +59,33 @@ </property> </spacer> </item> - <item row="4" column="0" colspan="3" > - <widget class="QLabel" name="error_message" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > + <item row="5" column="0" colspan="3"> + <widget class="QLabel" name="error_message"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text" > + <property name="text"> <string/> </property> </widget> </item> - <item row="3" column="0" colspan="3" > - <widget class="QGroupBox" name="size_box" > - <property name="title" > + <item row="4" column="0" colspan="3"> + <widget class="QGroupBox" name="size_box"> + <property name="title"> <string/> </property> </widget> </item> + <item row="3" column="0" colspan="3"> + <widget class="QCheckBox" name="use_chapters"> + <property name="text"> + <string>Use Kdenlive chapter files</string> + </property> + </widget> + </item> </layout> </widget> <customwidgets> Modified: trunk/kdenlive/src/widgets/renderwidget_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/renderwidget_ui.ui 2009-05-12 16:49:58 UTC (rev 3380) +++ trunk/kdenlive/src/widgets/renderwidget_ui.ui 2009-05-12 23:13:33 UTC (rev 3381) @@ -205,28 +205,21 @@ </property> </widget> </item> - <item row="6" column="0" colspan="9"> - <widget class="QCheckBox" name="open_dvd"> - <property name="text"> - <string>Open Dvd wizard after rendering</string> - </property> - </widget> - </item> - <item row="7" column="0" colspan="9"> + <item row="9" column="0" colspan="9"> <widget class="QCheckBox" name="open_browser"> <property name="text"> <string>Open browser window after export</string> </property> </widget> </item> - <item row="8" column="0" colspan="9"> + <item row="10" column="0" colspan="9"> <widget class="QCheckBox" name="play_after"> <property name="text"> <string>Play after render</string> </property> </widget> </item> - <item row="9" column="0" colspan="9"> + <item row="11" column="0" colspan="9"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> <widget class="QRadioButton" name="render_full"> @@ -254,7 +247,7 @@ </item> </layout> </item> - <item row="10" column="0" colspan="9"> + <item row="12" column="0" colspan="9"> <widget class="QGroupBox" name="guides_box"> <property name="title"> <string/> @@ -297,14 +290,14 @@ </layout> </widget> </item> - <item row="11" column="0" colspan="3"> + <item row="13" column="0" colspan="3"> <widget class="QToolButton" name="buttonStart"> <property name="popupMode"> <enum>QToolButton::MenuButtonPopup</enum> </property> </widget> </item> - <item row="11" column="3" colspan="4"> + <item row="13" column="3" colspan="4"> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -317,13 +310,27 @@ </property> </spacer> </item> - <item row="11" column="7" colspan="2"> + <item row="13" column="7" colspan="2"> <widget class="KPushButton" name="buttonClose"> <property name="text"> <string>Close</string> </property> </widget> </item> + <item row="6" column="0" colspan="9"> + <widget class="QCheckBox" name="open_dvd"> + <property name="text"> + <string>Open Dvd wizard after rendering</string> + </property> + </widget> + </item> + <item row="7" column="0" colspan="9"> + <widget class="QCheckBox" name="create_chapter"> + <property name="text"> + <string>Create chapter file based on guides</string> + </property> + </widget> + </item> </layout> </widget> <widget class="QWidget" name="tab_2"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-16 18:07:19
|
Revision: 3387 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3387&view=rev Author: j-b-m Date: 2009-05-16 18:07:09 +0000 (Sat, 16 May 2009) Log Message: ----------- Updated dvdwizard ui files Modified Paths: -------------- trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui Modified: trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui 2009-05-14 13:43:23 UTC (rev 3386) +++ trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui 2009-05-16 18:07:09 UTC (rev 3387) @@ -18,9 +18,6 @@ </property> </widget> </item> - <item row="0" column="1"> - <widget class="KComboBox" name="menu_profile"/> - </item> <item row="1" column="0" colspan="2"> <widget class="QGroupBox" name="menu_box"> <property name="title"> Modified: trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui 2009-05-14 13:43:23 UTC (rev 3386) +++ trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui 2009-05-16 18:07:09 UTC (rev 3387) @@ -6,19 +6,19 @@ <rect> <x>0</x> <y>0</y> - <width>334</width> - <height>246</height> + <width>391</width> + <height>348</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> + <item row="1" column="0" colspan="4"> <widget class="QCheckBox" name="use_intro"> <property name="text"> <string>Intro movie</string> </property> </widget> </item> - <item row="0" column="1" colspan="2"> + <item row="1" column="6"> <widget class="KUrlRequester" name="intro_vob"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -28,38 +28,72 @@ </property> </widget> </item> - <item row="1" column="0" colspan="3"> - <widget class="QGroupBox" name="vob_list"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <item row="2" column="0" colspan="7"> + <widget class="QTreeWidget" name="vobs_list"> + <property name="alternatingRowColors"> + <bool>true</bool> </property> - <property name="title"> - <string>DVD Files</string> + <property name="rootIsDecorated"> + <bool>true</bool> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="KUrlRequester" name="vob_1"/> - </item> - </layout> + <property name="headerHidden"> + <bool>false</bool> + </property> + <attribute name="headerVisible"> + <bool>true</bool> + </attribute> + <column> + <property name="text"> + <string>File</string> + </property> + </column> + <column> + <property name="text"> + <string>Duration</string> + </property> + </column> + <column> + <property name="text"> + <string>Size</string> + </property> + </column> </widget> </item> - <item row="2" column="0"> - <spacer name="verticalSpacer"> + <item row="4" column="3"> + <widget class="QToolButton" name="button_up"> + <property name="text"> + <string>...</string> + </property> + </widget> + </item> + <item row="4" column="4"> + <widget class="QToolButton" name="button_down"> + <property name="text"> + <string>...</string> + </property> + </widget> + </item> + <item row="4" column="5" colspan="2"> + <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>182</width> - <height>37</height> + <width>244</width> + <height>20</height> </size> </property> </spacer> </item> - <item row="5" column="0" colspan="3"> + <item row="5" column="0" colspan="7"> + <widget class="QGroupBox" name="size_box"> + <property name="title"> + <string/> + </property> + </widget> + </item> + <item row="6" column="0" colspan="7"> <widget class="QLabel" name="error_message"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -72,20 +106,30 @@ </property> </widget> </item> - <item row="4" column="0" colspan="3"> - <widget class="QGroupBox" name="size_box"> - <property name="title"> - <string/> + <item row="0" column="6"> + <widget class="KComboBox" name="dvd_profile"/> + </item> + <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>DVD format</string> </property> </widget> </item> - <item row="3" column="0" colspan="3"> - <widget class="QCheckBox" name="use_chapters"> + <item row="4" column="1"> + <widget class="QPushButton" name="button_add"> <property name="text"> - <string>Use Kdenlive chapter files</string> + <string>Add movie file</string> </property> </widget> </item> + <item row="4" column="2"> + <widget class="QPushButton" name="button_delete"> + <property name="text"> + <string>Remove file</string> + </property> + </widget> + </item> </layout> </widget> <customwidgets> @@ -94,6 +138,11 @@ <extends>QFrame</extends> <header>kurlrequester.h</header> </customwidget> + <customwidget> + <class>KComboBox</class> + <extends>QComboBox</extends> + <header>kcombobox.h</header> + </customwidget> </customwidgets> <resources/> <connections/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-24 22:50:52
|
Revision: 3413 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3413&view=rev Author: j-b-m Date: 2009-05-24 22:50:44 +0000 (Sun, 24 May 2009) Log Message: ----------- updated DVD wizard ui Modified Paths: -------------- trunk/kdenlive/src/widgets/dvdwizardchapters_ui.ui trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui Modified: trunk/kdenlive/src/widgets/dvdwizardchapters_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardchapters_ui.ui 2009-05-24 22:32:29 UTC (rev 3412) +++ trunk/kdenlive/src/widgets/dvdwizardchapters_ui.ui 2009-05-24 22:50:44 UTC (rev 3413) @@ -61,13 +61,6 @@ </property> </spacer> </item> - <item row="3" column="4"> - <widget class="QPushButton" name="button_save"> - <property name="text"> - <string>save</string> - </property> - </widget> - </item> <item row="0" column="0" colspan="5"> <widget class="QGroupBox" name="monitor_frame"> <property name="title"> Modified: trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2009-05-24 22:32:29 UTC (rev 3412) +++ trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2009-05-24 22:50:44 UTC (rev 3413) @@ -11,7 +11,7 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> - <item row="2" column="0" colspan="5"> + <item row="2" column="0" colspan="4"> <widget class="QListWidget" name="job_progress"> <property name="enabled"> <bool>false</bool> @@ -46,7 +46,7 @@ </item> </widget> </item> - <item row="4" column="0" colspan="5"> + <item row="4" column="0" colspan="4"> <widget class="QGroupBox" name="error_box"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> @@ -121,7 +121,7 @@ </property> </widget> </item> - <item row="3" column="3"> + <item row="3" column="2"> <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -134,13 +134,6 @@ </property> </spacer> </item> - <item row="3" column="2"> - <widget class="QPushButton" name="button_save"> - <property name="text"> - <string>Save project</string> - </property> - </widget> - </item> <item row="3" column="1"> <widget class="QPushButton" name="button_abort"> <property name="enabled"> @@ -158,7 +151,7 @@ </property> </widget> </item> - <item row="0" column="1" colspan="3"> + <item row="0" column="1" colspan="2"> <widget class="KUrlRequester" name="tmp_folder"/> </item> <item row="1" column="0"> @@ -168,7 +161,7 @@ </property> </widget> </item> - <item row="1" column="1" colspan="3"> + <item row="1" column="1" colspan="2"> <widget class="KUrlRequester" name="iso_image"/> </item> </layout> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-29 09:32:26
|
Revision: 3440 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3440&view=rev Author: j-b-m Date: 2009-05-29 09:32:18 +0000 (Fri, 29 May 2009) Log Message: ----------- Add widget to select between timecode (hh:mm:ss:ff) and frame count in slideshow properties Modified Paths: -------------- trunk/kdenlive/src/widgets/clipproperties_ui.ui trunk/kdenlive/src/widgets/slideshowclip_ui.ui Modified: trunk/kdenlive/src/widgets/clipproperties_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/clipproperties_ui.ui 2009-05-29 00:51:19 UTC (rev 3439) +++ trunk/kdenlive/src/widgets/clipproperties_ui.ui 2009-05-29 09:32:18 UTC (rev 3440) @@ -1,24 +1,25 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ClipProperties_UI</class> - <widget class="QDialog" name="ClipProperties_UI" > - <property name="geometry" > + <widget class="QDialog" name="ClipProperties_UI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>339</width> - <height>464</height> + <width>286</width> + <height>436</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Clip Properties</string> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="7" column="1" colspan="2" > - <spacer name="verticalSpacer_4" > - <property name="orientation" > + <layout class="QGridLayout" name="gridLayout_2"> + <item row="7" column="1" colspan="2"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>17</height> @@ -26,150 +27,150 @@ </property> </spacer> </item> - <item row="0" column="0" colspan="4" > - <widget class="QLabel" name="clip_thumb" > - <property name="text" > - <string>Image preview</string> - </property> - <property name="alignment" > - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item row="1" column="0" colspan="4" > - <widget class="QLabel" name="label_5" > - <property name="text" > + <item row="1" column="0" colspan="4"> + <widget class="QLabel" name="label_5"> + <property name="text"> <string>Path</string> </property> </widget> </item> - <item row="2" column="0" colspan="4" > - <widget class="KLineEdit" name="clip_path" > - <property name="readOnly" > + <item row="2" column="0" colspan="4"> + <widget class="KLineEdit" name="clip_path"> + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="3" column="0" colspan="4" > - <widget class="QLabel" name="label_3" > - <property name="text" > + <item row="3" column="0" colspan="4"> + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Description</string> </property> </widget> </item> - <item row="4" column="0" colspan="4" > - <widget class="KLineEdit" name="clip_description" /> + <item row="4" column="0" colspan="4"> + <widget class="KLineEdit" name="clip_description"/> </item> - <item row="5" column="0" > - <widget class="QLabel" name="clip_filesize_2" > - <property name="text" > + <item row="5" column="0"> + <widget class="QLabel" name="clip_filesize_2"> + <property name="text"> <string>Duration</string> </property> </widget> </item> - <item row="5" column="1" > - <widget class="KRestrictedLine" name="clip_duration" > - <property name="inputMask" > + <item row="5" column="1"> + <widget class="KRestrictedLine" name="clip_duration"> + <property name="inputMask"> <string>99:99:99:99; </string> </property> </widget> </item> - <item row="5" column="2" > - <widget class="QLabel" name="clip_filesize_3" > - <property name="text" > + <item row="5" column="2"> + <widget class="QLabel" name="clip_filesize_3"> + <property name="text"> <string>Size:</string> </property> </widget> </item> - <item row="5" column="3" > - <widget class="QLabel" name="clip_filesize" > - <property name="text" > + <item row="5" column="3"> + <widget class="QLabel" name="clip_filesize"> + <property name="text"> <string>File size</string> </property> </widget> </item> - <item row="8" column="0" colspan="4" > - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <item row="8" column="0" colspan="4"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> - <item row="6" column="0" colspan="4" > - <widget class="QTabWidget" name="tabWidget" > - <property name="currentIndex" > + <item row="0" column="0" colspan="4"> + <widget class="QLabel" name="clip_thumb"> + <property name="text"> + <string>Image preview</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item row="6" column="0" colspan="4"> + <widget class="QTabWidget" name="tabWidget"> + <property name="currentIndex"> <number>0</number> </property> - <widget class="QWidget" name="tab_video" > - <attribute name="title" > + <widget class="QWidget" name="tab_video"> + <attribute name="title"> <string>Video</string> </attribute> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" colspan="2" > - <widget class="QLabel" name="label_8" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="label_8"> + <property name="text"> <string>Video codec</string> </property> </widget> </item> - <item row="0" column="2" > - <widget class="KLineEdit" name="clip_vcodec" > - <property name="readOnly" > + <item row="0" column="2"> + <widget class="KLineEdit" name="clip_vcodec"> + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="QLabel" name="label_6" > - <property name="text" > + <item row="1" column="0" colspan="2"> + <widget class="QLabel" name="label_6"> + <property name="text"> <string>Frame size</string> </property> </widget> </item> - <item row="1" column="2" > - <widget class="KLineEdit" name="clip_size" > - <property name="readOnly" > + <item row="1" column="2"> + <widget class="KLineEdit" name="clip_size"> + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="0" colspan="2" > - <widget class="QLabel" name="label_7" > - <property name="text" > + <item row="2" column="0" colspan="2"> + <widget class="QLabel" name="label_7"> + <property name="text"> <string>Frame rate</string> </property> </widget> </item> - <item row="2" column="2" > - <widget class="KLineEdit" name="clip_fps" > - <property name="readOnly" > + <item row="2" column="2"> + <widget class="KLineEdit" name="clip_fps"> + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="3" column="0" colspan="2" > - <widget class="QLabel" name="label_12" > - <property name="text" > + <item row="3" column="0" colspan="2"> + <widget class="QLabel" name="label_12"> + <property name="text"> <string>Pixel aspect ratio</string> </property> </widget> </item> - <item row="3" column="2" > - <widget class="KLineEdit" name="clip_ratio" > - <property name="readOnly" > + <item row="3" column="2"> + <widget class="KLineEdit" name="clip_ratio"> + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="4" column="2" > - <spacer name="verticalSpacer_2" > - <property name="orientation" > + <item row="4" column="2"> + <spacer name="verticalSpacer_2"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>17</height> @@ -179,31 +180,31 @@ </item> </layout> </widget> - <widget class="QWidget" name="tab_audio" > - <attribute name="title" > + <widget class="QWidget" name="tab_audio"> + <attribute name="title"> <string>Audio</string> </attribute> - <layout class="QGridLayout" name="gridLayout_4" > - <item row="0" column="1" colspan="2" > - <widget class="KLineEdit" name="clip_acodec" > - <property name="readOnly" > + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="1" colspan="2"> + <widget class="KLineEdit" name="clip_acodec"> + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="1" colspan="2" > - <widget class="KLineEdit" name="clip_frequency" > - <property name="readOnly" > + <item row="2" column="1" colspan="2"> + <widget class="KLineEdit" name="clip_frequency"> + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="3" column="2" > - <spacer name="verticalSpacer_3" > - <property name="orientation" > + <item row="3" column="2"> + <spacer name="verticalSpacer_3"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>77</width> <height>52</height> @@ -211,30 +212,30 @@ </property> </spacer> </item> - <item row="1" column="1" colspan="2" > - <widget class="KLineEdit" name="clip_channels" > - <property name="readOnly" > + <item row="1" column="1" colspan="2"> + <widget class="KLineEdit" name="clip_channels"> + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="0" column="0" > - <widget class="QLabel" name="label_9" > - <property name="text" > + <item row="0" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> <string>Audio codec</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_11" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> <string>Channels</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_10" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="label_10"> + <property name="text"> <string>Frequency</string> </property> </widget> @@ -248,27 +249,27 @@ <zorder>label_11</zorder> <zorder>label_10</zorder> </widget> - <widget class="QWidget" name="tab" > - <attribute name="title" > + <widget class="QWidget" name="tab"> + <attribute name="title"> <string>Color</string> </attribute> - <layout class="QGridLayout" name="gridLayout_5" > - <item row="0" column="0" > - <widget class="QLabel" name="label_13" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout_5"> + <item row="0" column="0"> + <widget class="QLabel" name="label_13"> + <property name="text"> <string>Color</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="KColorButton" name="clip_color" /> + <item row="0" column="1"> + <widget class="KColorButton" name="clip_color"/> </item> - <item row="1" column="1" > - <spacer name="verticalSpacer_5" > - <property name="orientation" > + <item row="1" column="1"> + <spacer name="verticalSpacer_5"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>122</width> <height>118</height> @@ -278,79 +279,139 @@ </item> </layout> </widget> - <widget class="QWidget" name="tab_2" > - <attribute name="title" > + <widget class="QWidget" name="tab_2"> + <attribute name="title"> <string>Slideshow</string> </attribute> - <layout class="QGridLayout" name="gridLayout_6" > - <item row="0" column="0" > - <widget class="QLabel" name="label_14" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout_6"> + <item row="0" column="0"> + <widget class="QLabel" name="label_14"> + <property name="text"> <string>Image type</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="KComboBox" name="image_type" /> + <item row="0" column="1" colspan="2"> + <widget class="KComboBox" name="image_type"/> </item> - <item row="1" column="0" > - <widget class="QLabel" name="clip_filesize_4" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="clip_filesize_4"> + <property name="text"> <string>Frame duration</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="KRestrictedLine" name="slide_duration" > - <property name="inputMask" > - <string>99:99:99:99; </string> - </property> - </widget> + <item row="1" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="KRestrictedLine" name="slide_duration"> + <property name="inputMask"> + <string>99:99:99:99; </string> + </property> + </widget> + </item> + <item> + <widget class="KIntSpinBox" name="slide_duration_frames"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>256000</number> + </property> + </widget> + </item> + </layout> </item> - <item row="2" column="0" > - <widget class="QCheckBox" name="slide_loop" > - <property name="text" > + <item row="1" column="2"> + <widget class="KComboBox" name="slide_duration_format"/> + </item> + <item row="2" column="0" colspan="3"> + <widget class="QCheckBox" name="slide_loop"> + <property name="text"> <string>Loop</string> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QCheckBox" name="slide_fade" > - <property name="text" > + <item row="3" column="0"> + <widget class="QCheckBox" name="slide_fade"> + <property name="text"> <string>Crossfade</string> </property> </widget> </item> - <item row="3" column="1" > - <widget class="KRestrictedLine" name="luma_duration" > - <property name="inputMask" > - <string>99:99:99:99; </string> + <item row="3" column="1" colspan="2"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="KRestrictedLine" name="luma_duration"> + <property name="inputMask"> + <string>99:99:99:99; </string> + </property> + </widget> + </item> + <item> + <widget class="KIntSpinBox" name="luma_duration_frames"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>256000</number> + </property> + </widget> + </item> + </layout> + </item> + <item row="4" column="0"> + <widget class="QCheckBox" name="slide_luma"> + <property name="text"> + <string>Luma file</string> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QCheckBox" name="slide_luma" > - <property name="text" > - <string>Luma file</string> + <item row="4" column="1" colspan="2"> + <widget class="KComboBox" name="luma_file"/> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_softness"> + <property name="text"> + <string>Softness</string> </property> </widget> </item> - <item row="4" column="1" > - <widget class="KComboBox" name="luma_file" /> + <item row="5" column="1" colspan="2"> + <widget class="QSlider" name="luma_softness"> + <property name="maximum"> + <number>100</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> </item> - <item row="6" column="0" colspan="2" > - <widget class="QLabel" name="slide_info" > - <property name="text" > + <item row="6" column="0" colspan="3"> + <widget class="QLabel" name="slide_info"> + <property name="text"> <string>No image found</string> </property> </widget> </item> - <item row="7" column="1" > - <spacer name="verticalSpacer_6" > - <property name="orientation" > + <item row="7" column="1"> + <spacer name="verticalSpacer_6"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>15</height> @@ -358,57 +419,40 @@ </property> </spacer> </item> - <item row="5" column="1" > - <widget class="QSlider" name="luma_softness" > - <property name="maximum" > - <number>100</number> - </property> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="5" column="0" > - <widget class="QLabel" name="label_softness" > - <property name="text" > - <string>Softness</string> - </property> - </widget> - </item> </layout> </widget> - <widget class="QWidget" name="tab_4" > - <attribute name="title" > + <widget class="QWidget" name="tab_4"> + <attribute name="title"> <string>Image</string> </attribute> - <layout class="QGridLayout" name="gridLayout_8" > - <item row="0" column="0" > - <widget class="QLabel" name="label_16" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout_8"> + <item row="0" column="0"> + <widget class="QLabel" name="label_16"> + <property name="text"> <string>Image size</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="KLineEdit" name="image_size" > - <property name="readOnly" > + <item row="0" column="1"> + <widget class="KLineEdit" name="image_size"> + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="QCheckBox" name="image_transparency" > - <property name="text" > + <item row="1" column="0" colspan="2"> + <widget class="QCheckBox" name="image_transparency"> + <property name="text"> <string>Transparent background</string> </property> </widget> </item> - <item row="2" column="0" > - <spacer name="verticalSpacer_7" > - <property name="orientation" > + <item row="2" column="0"> + <spacer name="verticalSpacer_7"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>151</height> @@ -418,67 +462,67 @@ </item> </layout> </widget> - <widget class="QWidget" name="tab_3" > - <attribute name="title" > + <widget class="QWidget" name="tab_3"> + <attribute name="title"> <string>Markers</string> </attribute> - <layout class="QGridLayout" name="gridLayout_7" > - <item row="0" column="0" colspan="4" > - <widget class="QTreeWidget" name="markers_list" > - <property name="alternatingRowColors" > + <layout class="QGridLayout" name="gridLayout_7"> + <item row="0" column="0" colspan="4"> + <widget class="QTreeWidget" name="markers_list"> + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="rootIsDecorated" > + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="itemsExpandable" > + <property name="itemsExpandable"> <bool>false</bool> </property> - <property name="allColumnsShowFocus" > + <property name="allColumnsShowFocus"> <bool>true</bool> </property> - <property name="headerHidden" > + <property name="headerHidden"> <bool>true</bool> </property> <column> - <property name="text" > + <property name="text"> <string>Time</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Comment</string> </property> </column> </widget> </item> - <item row="1" column="0" > - <widget class="QToolButton" name="marker_new" > - <property name="text" > + <item row="1" column="0"> + <widget class="QToolButton" name="marker_new"> + <property name="text"> <string>N</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QToolButton" name="marker_edit" > - <property name="text" > + <item row="1" column="1"> + <widget class="QToolButton" name="marker_edit"> + <property name="text"> <string>E</string> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QToolButton" name="marker_delete" > - <property name="text" > + <item row="1" column="2"> + <widget class="QToolButton" name="marker_delete"> + <property name="text"> <string>D</string> </property> </widget> </item> - <item row="1" column="3" > - <spacer name="horizontalSpacer" > - <property name="orientation" > + <item row="1" column="3"> + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>177</width> <height>20</height> @@ -488,41 +532,41 @@ </item> </layout> </widget> - <widget class="QWidget" name="tab_5" > - <attribute name="title" > + <widget class="QWidget" name="tab_5"> + <attribute name="title"> <string>Metadata</string> </attribute> - <layout class="QGridLayout" name="gridLayout_9" > - <item row="0" column="0" > - <widget class="QTreeWidget" name="metadata_list" > - <property name="rootIsDecorated" > + <layout class="QGridLayout" name="gridLayout_9"> + <item row="0" column="0"> + <widget class="QTreeWidget" name="metadata_list"> + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="itemsExpandable" > + <property name="itemsExpandable"> <bool>false</bool> </property> - <property name="sortingEnabled" > + <property name="sortingEnabled"> <bool>false</bool> </property> - <property name="allColumnsShowFocus" > + <property name="allColumnsShowFocus"> <bool>true</bool> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> - <property name="headerHidden" > + <property name="headerHidden"> <bool>true</bool> </property> - <property name="columnCount" > + <property name="columnCount"> <number>2</number> </property> <column> - <property name="text" > + <property name="text"> <string>1</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>2</string> </property> </column> @@ -530,17 +574,17 @@ </item> </layout> </widget> - <widget class="QWidget" name="tab_advanced" > - <attribute name="title" > + <widget class="QWidget" name="tab_advanced"> + <attribute name="title"> <string>Advanced</string> </attribute> - <layout class="QGridLayout" name="gridLayout_3" > - <item row="4" column="2" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <layout class="QGridLayout" name="gridLayout_3"> + <item row="4" column="2"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>19</height> @@ -548,76 +592,76 @@ </property> </spacer> </item> - <item row="0" column="1" > - <widget class="QCheckBox" name="clip_force_ar" > - <property name="text" > + <item row="0" column="1"> + <widget class="QCheckBox" name="clip_force_ar"> + <property name="text"> <string>Force pixel aspect ratio</string> </property> </widget> </item> - <item row="0" column="2" > - <widget class="KDoubleNumInput" name="clip_ar" > - <property name="enabled" > + <item row="0" column="2"> + <widget class="KDoubleNumInput" name="clip_ar"> + <property name="enabled"> <bool>false</bool> </property> </widget> </item> - <item row="2" column="2" > - <widget class="QSpinBox" name="clip_vindex" > - <property name="enabled" > + <item row="2" column="2"> + <widget class="QSpinBox" name="clip_vindex"> + <property name="enabled"> <bool>false</bool> </property> - <property name="minimum" > + <property name="minimum"> <number>-1</number> </property> - <property name="value" > + <property name="value"> <number>0</number> </property> </widget> </item> - <item row="3" column="2" > - <widget class="QSpinBox" name="clip_aindex" > - <property name="enabled" > + <item row="3" column="2"> + <widget class="QSpinBox" name="clip_aindex"> + <property name="enabled"> <bool>false</bool> </property> - <property name="minimum" > + <property name="minimum"> <number>-1</number> </property> - <property name="value" > + <property name="value"> <number>0</number> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QCheckBox" name="clip_force_threads" > - <property name="text" > + <item row="1" column="1"> + <widget class="QCheckBox" name="clip_force_threads"> + <property name="text"> <string>Decoding threads</string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QCheckBox" name="clip_force_vindex" > - <property name="text" > + <item row="2" column="1"> + <widget class="QCheckBox" name="clip_force_vindex"> + <property name="text"> <string>Video index</string> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QCheckBox" name="clip_force_aindex" > - <property name="text" > + <item row="3" column="1"> + <widget class="QCheckBox" name="clip_force_aindex"> + <property name="text"> <string>Audio index</string> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QSpinBox" name="clip_threads" > - <property name="enabled" > + <item row="1" column="2"> + <widget class="QSpinBox" name="clip_threads"> + <property name="enabled"> <bool>false</bool> </property> - <property name="maximum" > + <property name="maximum"> <number>4</number> </property> - <property name="value" > + <property name="value"> <number>1</number> </property> </widget> @@ -630,16 +674,11 @@ </widget> <customwidgets> <customwidget> - <class>KColorButton</class> - <extends>QPushButton</extends> - <header>kcolorbutton.h</header> + <class>KIntSpinBox</class> + <extends>QSpinBox</extends> + <header>knuminput.h</header> </customwidget> <customwidget> - <class>KComboBox</class> - <extends>QComboBox</extends> - <header>kcombobox.h</header> - </customwidget> - <customwidget> <class>KDoubleNumInput</class> <extends>QWidget</extends> <header>knuminput.h</header> @@ -650,6 +689,16 @@ <header>klineedit.h</header> </customwidget> <customwidget> + <class>KComboBox</class> + <extends>QComboBox</extends> + <header>kcombobox.h</header> + </customwidget> + <customwidget> + <class>KColorButton</class> + <extends>QPushButton</extends> + <header>kcolorbutton.h</header> + </customwidget> + <customwidget> <class>KRestrictedLine</class> <extends>KLineEdit</extends> <header>krestrictedline.h</header> @@ -663,11 +712,11 @@ <receiver>ClipProperties_UI</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>248</x> <y>254</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>274</y> </hint> @@ -679,11 +728,11 @@ <receiver>ClipProperties_UI</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>316</x> <y>260</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>286</x> <y>274</y> </hint> Modified: trunk/kdenlive/src/widgets/slideshowclip_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/slideshowclip_ui.ui 2009-05-29 00:51:19 UTC (rev 3439) +++ trunk/kdenlive/src/widgets/slideshowclip_ui.ui 2009-05-29 09:32:18 UTC (rev 3440) @@ -1,142 +1,189 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SlideshowClip_UI</class> - <widget class="QDialog" name="SlideshowClip_UI" > - <property name="geometry" > + <widget class="QDialog" name="SlideshowClip_UI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>252</width> - <height>415</height> + <width>275</width> + <height>359</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Slideshow Clip</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Name</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="KLineEdit" name="clip_name" /> + <item row="0" column="1" colspan="2"> + <widget class="KLineEdit" name="clip_name"/> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Folder</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="KUrlRequester" name="folder_url" /> + <item row="1" column="1" colspan="2"> + <widget class="KUrlRequester" name="folder_url"/> </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>Frame Duration</string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="KRestrictedLine" name="clip_duration" > - <property name="inputMask" > - <string>99:99:99:99; </string> - </property> - </widget> + <item row="2" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="KRestrictedLine" name="clip_duration"> + <property name="inputMask"> + <string>99:99:99:99; </string> + </property> + </widget> + </item> + <item> + <widget class="KIntSpinBox" name="clip_duration_frames"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>256000</number> + </property> + </widget> + </item> + </layout> </item> - <item row="3" column="0" > - <widget class="QLabel" name="label_4" > - <property name="text" > + <item row="2" column="2"> + <widget class="KComboBox" name="clip_duration_format"/> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> <string>Image Type</string> </property> </widget> </item> - <item row="3" column="1" > - <widget class="KComboBox" name="image_type" /> + <item row="3" column="1" colspan="2"> + <widget class="KComboBox" name="image_type"/> </item> - <item row="4" column="0" > - <widget class="QCheckBox" name="slide_loop" > - <property name="text" > + <item row="4" column="0" colspan="3"> + <widget class="QCheckBox" name="slide_loop"> + <property name="text"> <string>Loop</string> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QCheckBox" name="slide_fade" > - <property name="text" > + <item row="5" column="0"> + <widget class="QCheckBox" name="slide_fade"> + <property name="text"> <string>Crossfade</string> </property> </widget> </item> - <item row="5" column="1" > - <widget class="KRestrictedLine" name="luma_duration" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="inputMask" > - <string>99:99:99:99; </string> - </property> - </widget> + <item row="5" column="1" colspan="2"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="KRestrictedLine" name="luma_duration"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="inputMask"> + <string>99:99:99:99; </string> + </property> + </widget> + </item> + <item> + <widget class="KIntSpinBox" name="luma_duration_frames"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>256000</number> + </property> + </widget> + </item> + </layout> </item> - <item row="6" column="0" > - <widget class="QCheckBox" name="luma_fade" > - <property name="enabled" > + <item row="6" column="0"> + <widget class="QCheckBox" name="luma_fade"> + <property name="enabled"> <bool>false</bool> </property> - <property name="text" > + <property name="text"> <string>Luma File</string> </property> </widget> </item> - <item row="6" column="1" > - <widget class="KComboBox" name="luma_file" > - <property name="enabled" > + <item row="6" column="1" colspan="2"> + <widget class="KComboBox" name="luma_file"> + <property name="enabled"> <bool>false</bool> </property> </widget> </item> - <item row="7" column="0" > - <widget class="QLabel" name="label_softness" > - <property name="enabled" > + <item row="7" column="0"> + <widget class="QLabel" name="label_softness"> + <property name="enabled"> <bool>false</bool> </property> - <property name="text" > + <property name="text"> <string>Softness</string> </property> </widget> </item> - <item row="7" column="1" > - <widget class="QSlider" name="luma_softness" > - <property name="enabled" > + <item row="7" column="1" colspan="2"> + <widget class="QSlider" name="luma_softness"> + <property name="enabled"> <bool>false</bool> </property> - <property name="maximum" > + <property name="maximum"> <number>100</number> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item row="8" column="0" colspan="2" > - <widget class="KListWidget" name="icon_list" /> + <item row="8" column="0" colspan="3"> + <widget class="KListWidget" name="icon_list"/> </item> - <item row="9" column="0" > - <widget class="QLabel" name="label_info" > - <property name="text" > + <item row="9" column="0" colspan="3"> + <widget class="QLabel" name="label_info"> + <property name="text"> <string>No image found</string> </property> </widget> </item> - <item row="10" column="0" colspan="2" > - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <item row="10" column="0" colspan="3"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> @@ -145,14 +192,14 @@ </widget> <customwidgets> <customwidget> - <class>KComboBox</class> - <extends>QComboBox</extends> - <header>kcombobox.h</header> + <class>KIntSpinBox</class> + <extends>QSpinBox</extends> + <header>knuminput.h</header> </customwidget> <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> + <class>KUrlRequester</class> + <extends>QFrame</extends> + <header>kurlrequester.h</header> </customwidget> <customwidget> <class>KListWidget</class> @@ -160,15 +207,20 @@ <header>klistwidget.h</header> </customwidget> <customwidget> + <class>KLineEdit</class> + <extends>QLineEdit</extends> + <header>klineedit.h</header> + </customwidget> + <customwidget> + <class>KComboBox</class> + <extends>QComboBox</extends> + <header>kcombobox.h</header> + </customwidget> + <customwidget> <class>KRestrictedLine</class> <extends>KLineEdit</extends> <header>krestrictedline.h</header> </customwidget> - <customwidget> - <class>KUrlRequester</class> - <extends>QFrame</extends> - <header>kurlrequester.h</header> - </customwidget> </customwidgets> <resources/> <connections> @@ -178,11 +230,11 @@ <receiver>SlideshowClip_UI</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>248</x> <y>254</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>274</y> </hint> @@ -194,11 +246,11 @@ <receiver>SlideshowClip_UI</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>316</x> <y>260</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>286</x> <y>274</y> </hint> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-18 16:59:42
|
Revision: 3577 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3577&view=rev Author: j-b-m Date: 2009-06-18 16:59:38 +0000 (Thu, 18 Jun 2009) Log Message: ----------- Updated ui for vertical zoom Modified Paths: -------------- trunk/kdenlive/src/widgets/configdisplay_ui.ui trunk/kdenlive/src/widgets/timeline_ui.ui trunk/kdenlive/src/widgets/trackheader_ui.ui Modified: trunk/kdenlive/src/widgets/configdisplay_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/configdisplay_ui.ui 2009-06-18 16:25:07 UTC (rev 3576) +++ trunk/kdenlive/src/widgets/configdisplay_ui.ui 2009-06-18 16:59:38 UTC (rev 3577) @@ -1,34 +1,35 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ConfigDisplay_UI</class> - <widget class="QWidget" name="ConfigDisplay_UI" > - <property name="geometry" > + <widget class="QWidget" name="ConfigDisplay_UI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>353</width> + <width>396</width> <height>197</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" colspan="3" > - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0" colspan="3"> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Thumbnails</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QCheckBox" name="kcfg_videothumbnails" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="kcfg_videothumbnails"> + <property name="text"> <string>Video</string> </property> </widget> </item> - <item row="0" column="1" > - <spacer name="horizontalSpacer" > - <property name="orientation" > + <item row="0" column="1"> + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>96</width> <height>20</height> @@ -36,16 +37,16 @@ </property> </spacer> </item> - <item row="1" column="0" > - <widget class="QCheckBox" name="kcfg_audiothumbnails" > - <property name="text" > + <item row="1" column="0"> + <widget class="QCheckBox" name="kcfg_audiothumbnails"> + <property name="text"> <string>Audio</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QCheckBox" name="kcfg_normaliseaudiothumbs" > - <property name="text" > + <item row="1" column="1"> + <widget class="QCheckBox" name="kcfg_normaliseaudiothumbs"> + <property name="text"> <string>Normalise audio for thumbnails</string> </property> </widget> @@ -53,36 +54,36 @@ </layout> </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="QCheckBox" name="kcfg_showmarkers" > - <property name="text" > + <item row="1" column="0" colspan="2"> + <widget class="QCheckBox" name="kcfg_showmarkers"> + <property name="text"> <string>Display clip markers comments</string> </property> </widget> </item> - <item row="2" column="0" colspan="3" > - <widget class="QCheckBox" name="kcfg_autoscroll" > - <property name="text" > + <item row="2" column="0" colspan="3"> + <widget class="QCheckBox" name="kcfg_autoscroll"> + <property name="text"> <string>Autoscroll while playing</string> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <item row="3" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Track height</string> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QSpinBox" name="kcfg_trackheight" /> + <item row="3" column="1"> + <widget class="QSpinBox" name="kcfg_defaulttrackheight"/> </item> - <item row="3" column="2" > - <spacer name="horizontalSpacer_2" > - <property name="orientation" > + <item row="3" column="2"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>166</width> <height>20</height> @@ -90,12 +91,12 @@ </property> </spacer> </item> - <item row="5" column="1" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="5" column="1"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>23</height> Modified: trunk/kdenlive/src/widgets/timeline_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/timeline_ui.ui 2009-06-18 16:25:07 UTC (rev 3576) +++ trunk/kdenlive/src/widgets/timeline_ui.ui 2009-06-18 16:59:38 UTC (rev 3577) @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>342</width> + <width>308</width> <height>163</height> </rect> </property> @@ -17,6 +17,25 @@ <property name="spacing"> <number>0</number> </property> + <item row="0" column="0"> + <widget class="QFrame" name="size_frame"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>20</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="lineWidth"> + <number>0</number> + </property> + </widget> + </item> <item row="0" column="1"> <widget class="QFrame" name="ruler_frame"> <property name="enabled"> @@ -88,17 +107,27 @@ <number>0</number> </property> <item row="0" column="0"> - <widget class="QWidget" name="headers_container" native="true"/> + <widget class="QWidget" name="headers_container" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> </item> <item row="1" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> - <height>148</height> + <width>57</width> + <height>145</height> </size> </property> </spacer> Modified: trunk/kdenlive/src/widgets/trackheader_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/trackheader_ui.ui 2009-06-18 16:25:07 UTC (rev 3576) +++ trunk/kdenlive/src/widgets/trackheader_ui.ui 2009-06-18 16:59:38 UTC (rev 3577) @@ -1,119 +1,129 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>TrackHeader_UI</class> - <widget class="QWidget" name="TrackHeader_UI" > - <property name="geometry" > + <widget class="QWidget" name="TrackHeader_UI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>58</width> - <height>54</height> + <width>86</width> + <height>51</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <property name="margin" > + <layout class="QGridLayout" name="gridLayout_2"> + <property name="margin"> <number>0</number> </property> - <item row="0" column="0" > - <widget class="QFrame" name="frame" > - <property name="frameShape" > + <item row="0" column="0"> + <widget class="QFrame" name="frame"> + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QGridLayout" name="gridLayout" > - <property name="margin" > + <layout class="QGridLayout" name="gridLayout"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> <number>0</number> </property> - <property name="spacing" > - <number>-1</number> + <property name="rightMargin"> + <number>2</number> </property> - <item row="0" column="0" > - <widget class="QToolButton" name="buttonLock" > - <property name="maximumSize" > + <property name="bottomMargin"> + <number>0</number> + </property> + <property name="spacing"> + <number>0</number> + </property> + <item row="0" column="0"> + <widget class="QToolButton" name="buttonLock"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="text" > + <property name="text"> <string/> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="arrowType" > + <property name="arrowType"> <enum>Qt::NoArrow</enum> </property> </widget> </item> - <item row="0" column="2" > - <widget class="QLabel" name="track_number" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Maximum" hsizetype="Expanding" > + <item row="0" column="2"> + <widget class="QLabel" name="track_number"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text" > + <property name="text"> <string>0</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QToolButton" name="buttonAudio" > - <property name="maximumSize" > + <item row="1" column="0"> + <widget class="QToolButton" name="buttonAudio"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="text" > + <property name="text"> <string>A</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="arrowType" > + <property name="arrowType"> <enum>Qt::NoArrow</enum> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QToolButton" name="buttonVideo" > - <property name="maximumSize" > + <item row="1" column="1"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> <size> + <width>29</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="buttonVideo"> + <property name="maximumSize"> + <size> <width>22</width> <height>22</height> </size> </property> - <property name="text" > + <property name="text"> <string>V</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <property name="checked" > + <property name="checked"> <bool>false</bool> </property> </widget> </item> - <item row="1" column="1" > - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> </item> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-08-09 16:32:58
|
Revision: 3807 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3807&view=rev Author: j-b-m Date: 2009-08-09 16:32:47 +0000 (Sun, 09 Aug 2009) Log Message: ----------- Fix compile warnings Modified Paths: -------------- trunk/kdenlive/src/widgets/clipdurationdialog_ui.ui trunk/kdenlive/src/widgets/markerdialog_ui.ui trunk/kdenlive/src/widgets/spacerdialog_ui.ui trunk/kdenlive/src/widgets/unicodedialog_ui.ui Modified: trunk/kdenlive/src/widgets/clipdurationdialog_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/clipdurationdialog_ui.ui 2009-08-09 16:31:31 UTC (rev 3806) +++ trunk/kdenlive/src/widgets/clipdurationdialog_ui.ui 2009-08-09 16:32:47 UTC (rev 3807) @@ -1,120 +1,253 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ClipDurationDialog_UI</class> - <widget class="QDialog" name="ClipDurationDialog_UI" > - <property name="geometry" > + <widget class="QDialog" name="ClipDurationDialog_UI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>226</width> - <height>149</height> + <height>169</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Duration</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="position_label" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="position_label"> + <property name="text"> <string>Position</string> </property> </widget> </item> - <item row="0" column="1" > - <layout class="QHBoxLayout" name="horizontalLayout" > + <item row="0" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="KRestrictedLine" name="clip_position" > - <property name="inputMask" > + <widget class="KRestrictedLine" name="clip_position"> + <property name="inputMask"> <string>99:99:99:99; </string> </property> </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> <item> - <widget class="KArrowButton" name="position_up" /> + <widget class="QToolButton" name="position_up"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::UpArrow</enum> + </property> + </widget> </item> <item> - <widget class="KArrowButton" name="position_down" > - <property name="arrowType" stdset="0" > - <number>2</number> + <widget class="QToolButton" name="position_down"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::DownArrow</enum> + </property> </widget> </item> </layout> </item> </layout> </item> - <item row="1" column="0" > - <widget class="QLabel" name="crop_label" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="crop_label"> + <property name="text"> <string>Crop start</string> </property> </widget> </item> - <item row="1" column="1" > - <layout class="QHBoxLayout" name="horizontalLayout_2" > + <item row="1" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="KRestrictedLine" name="crop_position" > - <property name="inputMask" > + <widget class="KRestrictedLine" name="crop_position"> + <property name="inputMask"> <string>99:99:99:99; </string> </property> </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="spacing"> + <number>0</number> + </property> <item> - <widget class="KArrowButton" name="crop_up" /> + <widget class="QToolButton" name="crop_up"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::UpArrow</enum> + </property> + </widget> </item> <item> - <widget class="KArrowButton" name="crop_down" > - <property name="arrowType" stdset="0" > - <number>2</number> + <widget class="QToolButton" name="crop_down"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::DownArrow</enum> + </property> </widget> </item> </layout> </item> </layout> </item> - <item row="2" column="0" > - <widget class="QLabel" name="duration_label" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="duration_label"> + <property name="text"> <string>Duration</string> </property> </widget> </item> - <item row="2" column="1" > - <layout class="QHBoxLayout" name="horizontalLayout_3" > + <item row="2" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> - <widget class="KRestrictedLine" name="clip_duration" > - <property name="inputMask" > + <widget class="KRestrictedLine" name="clip_duration"> + <property name="inputMask"> <string>99:99:99:99; </string> </property> + <property name="frame"> + <bool>true</bool> + </property> </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="spacing"> + <number>0</number> + </property> <item> - <widget class="KArrowButton" name="duration_up" /> + <widget class="QToolButton" name="duration_up"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::UpArrow</enum> + </property> + </widget> </item> <item> - <widget class="KArrowButton" name="duration_down" > - <property name="arrowType" stdset="0" > - <number>2</number> + <widget class="QToolButton" name="duration_down"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::DownArrow</enum> + </property> </widget> </item> </layout> </item> </layout> </item> - <item row="3" column="0" colspan="2" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="3" column="0" colspan="2"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>218</width> <height>2</height> @@ -122,12 +255,12 @@ </property> </spacer> </item> - <item row="4" column="0" colspan="2" > - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <item row="4" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> @@ -136,9 +269,9 @@ </widget> <customwidgets> <customwidget> - <class>KArrowButton</class> - <extends>QPushButton</extends> - <header>karrowbutton.h</header> + <class>KLineEdit</class> + <extends>QLineEdit</extends> + <header>klineedit.h</header> </customwidget> <customwidget> <class>KRestrictedLine</class> @@ -154,11 +287,11 @@ <receiver>ClipDurationDialog_UI</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>248</x> <y>254</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>274</y> </hint> @@ -170,11 +303,11 @@ <receiver>ClipDurationDialog_UI</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>316</x> <y>260</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>286</x> <y>274</y> </hint> Modified: trunk/kdenlive/src/widgets/markerdialog_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/markerdialog_ui.ui 2009-08-09 16:31:31 UTC (rev 3806) +++ trunk/kdenlive/src/widgets/markerdialog_ui.ui 2009-08-09 16:32:47 UTC (rev 3807) @@ -1,79 +1,110 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>MarkerDialog_UI</class> - <widget class="QDialog" name="MarkerDialog_UI" > - <property name="geometry" > + <widget class="QDialog" name="MarkerDialog_UI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>312</width> + <width>321</width> <height>111</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Marker</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item rowspan="2" row="0" column="0" > - <widget class="QLabel" name="clip_thumb" > - <property name="frameShape" > - <enum>QFrame::Box</enum> - </property> - <property name="text" > - <string>Image preview</string> - </property> - <property name="alignment" > - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QLabel" name="clip_filesize_2" > - <property name="text" > - <string>Position</string> - </property> - </widget> - </item> - <item row="0" column="2" > - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="2"> + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="KRestrictedLine" name="marker_position" > - <property name="inputMask" > + <widget class="KRestrictedLine" name="marker_position"> + <property name="inputMask"> <string>99:99:99:99; </string> </property> </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> <item> - <widget class="KArrowButton" name="position_up" /> + <widget class="QToolButton" name="position_up"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::UpArrow</enum> + </property> + </widget> </item> <item> - <widget class="KArrowButton" name="position_down" > - <property name="arrowType" stdset="0" > - <number>2</number> + <widget class="QToolButton" name="position_down"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::DownArrow</enum> + </property> </widget> </item> </layout> </item> </layout> </item> - <item row="1" column="1" > - <widget class="QLabel" name="clip_filesize_3" > - <property name="text" > + <item row="3" column="0" colspan="3"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="clip_filesize_3"> + <property name="text"> <string>Comment</string> </property> </widget> </item> - <item row="1" column="2" > - <widget class="KLineEdit" name="marker_comment" /> - </item> - <item row="2" column="1" colspan="2" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="2" column="1" colspan="2"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>218</width> <height>2</height> @@ -81,21 +112,31 @@ </property> </spacer> </item> - <item row="3" column="0" colspan="3" > - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> + <item row="0" column="0" rowspan="2"> + <widget class="QLabel" name="clip_thumb"> + <property name="frameShape"> + <enum>QFrame::Box</enum> </property> - <property name="standardButtons" > - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <property name="text"> + <string>Image preview</string> </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> </widget> </item> + <item row="1" column="2"> + <widget class="KLineEdit" name="marker_comment"/> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="clip_filesize_2"> + <property name="text"> + <string>Position</string> + </property> + </widget> + </item> </layout> <zorder>buttonBox</zorder> - <zorder>marker_position</zorder> - <zorder>position_up</zorder> - <zorder>position_down</zorder> <zorder>clip_filesize_3</zorder> <zorder>verticalSpacer</zorder> <zorder>clip_thumb</zorder> @@ -104,11 +145,6 @@ </widget> <customwidgets> <customwidget> - <class>KArrowButton</class> - <extends>QPushButton</extends> - <header>karrowbutton.h</header> - </customwidget> - <customwidget> <class>KLineEdit</class> <extends>QLineEdit</extends> <header>klineedit.h</header> @@ -127,11 +163,11 @@ <receiver>MarkerDialog_UI</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>248</x> <y>254</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>274</y> </hint> @@ -143,11 +179,11 @@ <receiver>MarkerDialog_UI</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>316</x> <y>260</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>286</x> <y>274</y> </hint> Modified: trunk/kdenlive/src/widgets/spacerdialog_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/spacerdialog_ui.ui 2009-08-09 16:31:31 UTC (rev 3806) +++ trunk/kdenlive/src/widgets/spacerdialog_ui.ui 2009-08-09 16:32:47 UTC (rev 3807) @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SpacerDialog_UI</class> - <widget class="QDialog" name="SpacerDialog_UI" > - <property name="geometry" > + <widget class="QDialog" name="SpacerDialog_UI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,58 +10,101 @@ <height>111</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Add space</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="3" > - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="3"> + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="KRestrictedLine" name="space_duration" > - <property name="inputMask" > + <widget class="KRestrictedLine" name="space_duration"> + <property name="inputMask"> <string>99:99:99:99; </string> </property> </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> <item> - <widget class="KArrowButton" name="position_up" /> + <widget class="QToolButton" name="position_up"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::UpArrow</enum> + </property> + </widget> </item> <item> - <widget class="KArrowButton" name="position_down" > - <property name="arrowType" stdset="0" > - <number>2</number> + <widget class="QToolButton" name="position_down"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::DownArrow</enum> + </property> </widget> </item> </layout> </item> </layout> </item> - <item row="3" column="0" colspan="4" > - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <item row="3" column="0" colspan="4"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QLabel" name="clip_filesize_3" > - <property name="text" > + <item row="1" column="1"> + <widget class="QLabel" name="clip_filesize_3"> + <property name="text"> <string>Track</string> </property> </widget> </item> - <item row="2" column="1" colspan="3" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="2" column="1" colspan="3"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>218</width> <height>2</height> @@ -68,23 +112,23 @@ </property> </spacer> </item> - <item row="0" column="1" > - <widget class="QLabel" name="clip_filesize_2" > - <property name="text" > + <item row="0" column="1"> + <widget class="QLabel" name="clip_filesize_2"> + <property name="text"> <string>Duration</string> </property> </widget> </item> - <item row="1" column="2" colspan="2" > - <widget class="KComboBox" name="track_number" /> + <item row="1" column="2" colspan="2"> + <widget class="KComboBox" name="track_number"/> </item> </layout> </widget> <customwidgets> <customwidget> - <class>KArrowButton</class> - <extends>QPushButton</extends> - <header>karrowbutton.h</header> + <class>KLineEdit</class> + <extends>QLineEdit</extends> + <header>klineedit.h</header> </customwidget> <customwidget> <class>KComboBox</class> @@ -105,11 +149,11 @@ <receiver>SpacerDialog_UI</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>248</x> <y>254</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>157</x> <y>274</y> </hint> @@ -121,11 +165,11 @@ <receiver>SpacerDialog_UI</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>316</x> <y>260</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>286</x> <y>274</y> </hint> Modified: trunk/kdenlive/src/widgets/unicodedialog_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/unicodedialog_ui.ui 2009-08-09 16:31:31 UTC (rev 3806) +++ trunk/kdenlive/src/widgets/unicodedialog_ui.ui 2009-08-09 16:32:47 UTC (rev 3807) @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>478</width> - <height>271</height> + <width>484</width> + <height>286</height> </rect> </property> <property name="sizePolicy"> @@ -164,14 +164,57 @@ </item> <item row="0" column="2"> <layout class="QVBoxLayout" name="verticalLayout_5"> + <property name="spacing"> + <number>0</number> + </property> <item> - <widget class="KArrowButton" name="arrowUp"/> + <widget class="QToolButton" name="arrowUp"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::UpArrow</enum> + </property> + </widget> </item> <item> - <widget class="KArrowButton" name="arrowDown"> - <property name="arrowType" stdset="0"> - <number>2</number> + <widget class="QToolButton" name="arrowDown"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>18</height> + </size> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + <property name="arrowType"> + <enum>Qt::DownArrow</enum> + </property> </widget> </item> </layout> @@ -276,13 +319,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>KArrowButton</class> - <extends>QPushButton</extends> - <header>karrowbutton.h</header> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-08-26 15:23:27
|
Revision: 3835 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3835&view=rev Author: j-b-m Date: 2009-08-26 15:23:19 +0000 (Wed, 26 Aug 2009) Log Message: ----------- small ui fixes Modified Paths: -------------- trunk/kdenlive/src/widgets/addtrack_ui.ui trunk/kdenlive/src/widgets/timeline_ui.ui trunk/kdenlive/src/widgets/trackheader_ui.ui Modified: trunk/kdenlive/src/widgets/addtrack_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/addtrack_ui.ui 2009-08-23 06:38:20 UTC (rev 3834) +++ trunk/kdenlive/src/widgets/addtrack_ui.ui 2009-08-26 15:23:19 UTC (rev 3835) @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>265</width> - <height>97</height> + <width>307</width> + <height>118</height> </rect> </property> <property name="windowTitle"> @@ -37,11 +37,30 @@ </item> <item row="0" column="3"> <widget class="KIntNumInput" name="track_nb"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="minimum"> <number>0</number> </property> </widget> </item> + <item row="0" column="4"> + <widget class="QLabel" name="track_name"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> <item row="1" column="0" colspan="2"> <widget class="QRadioButton" name="video_track"> <property name="text"> @@ -72,7 +91,7 @@ </property> </spacer> </item> - <item row="3" column="0" colspan="4"> + <item row="3" column="1" colspan="4"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -82,6 +101,19 @@ </property> </widget> </item> + <item row="1" column="4"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </widget> <customwidgets> Modified: trunk/kdenlive/src/widgets/timeline_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/timeline_ui.ui 2009-08-23 06:38:20 UTC (rev 3834) +++ trunk/kdenlive/src/widgets/timeline_ui.ui 2009-08-26 15:23:19 UTC (rev 3835) @@ -106,16 +106,6 @@ <property name="margin"> <number>0</number> </property> - <item row="0" column="0"> - <widget class="QWidget" name="headers_container" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> <item row="1" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> @@ -132,6 +122,16 @@ </property> </spacer> </item> + <item row="0" column="0"> + <widget class="QFrame" name="headers_container"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> </layout> </widget> </widget> Modified: trunk/kdenlive/src/widgets/trackheader_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/trackheader_ui.ui 2009-08-23 06:38:20 UTC (rev 3834) +++ trunk/kdenlive/src/widgets/trackheader_ui.ui 2009-08-26 15:23:19 UTC (rev 3835) @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>86</width> - <height>51</height> + <height>50</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> @@ -57,7 +57,7 @@ </property> </widget> </item> - <item row="0" column="2"> + <item row="0" column="1" colspan="2"> <widget class="QLabel" name="track_number"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Maximum"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-12-27 00:51:56
|
Revision: 5204 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5204&view=rev Author: j-b-m Date: 2010-12-27 00:51:50 +0000 (Mon, 27 Dec 2010) Log Message: ----------- GUI cleanup (remove frames around some tab widget) Modified Paths: -------------- trunk/kdenlive/src/widgets/projectsettings_ui.ui trunk/kdenlive/src/widgets/renderwidget_ui.ui Modified: trunk/kdenlive/src/widgets/projectsettings_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/projectsettings_ui.ui 2010-12-26 12:15:53 UTC (rev 5203) +++ trunk/kdenlive/src/widgets/projectsettings_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) @@ -6,19 +6,31 @@ <rect> <x>0</x> <y>0</y> - <width>291</width> - <height>320</height> + <width>289</width> + <height>367</height> </rect> </property> <property name="windowTitle"> <string>Project Settings</string> </property> <layout class="QGridLayout" name="gridLayout_3"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item row="0" column="0" colspan="2"> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> <number>0</number> </property> + <property name="documentMode"> + <bool>true</bool> + </property> <widget class="QWidget" name="tab"> <attribute name="title"> <string>Settings</string> @@ -360,14 +372,28 @@ </widget> </widget> </item> - <item row="1" column="1"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <item row="1" column="0" colspan="2"> + <widget class="QFrame" name="frame"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> </property> + <layout class="QGridLayout" name="gridLayout_5"> + <item row="0" column="0"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + <zorder>buttonBox</zorder> + <zorder>buttonBox</zorder> </widget> </item> </layout> Modified: trunk/kdenlive/src/widgets/renderwidget_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/renderwidget_ui.ui 2010-12-26 12:15:53 UTC (rev 5203) +++ trunk/kdenlive/src/widgets/renderwidget_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>362</width> - <height>555</height> + <height>554</height> </rect> </property> <property name="windowTitle"> @@ -22,6 +22,9 @@ <property name="currentIndex"> <number>0</number> </property> + <property name="documentMode"> + <bool>true</bool> + </property> <widget class="QWidget" name="tab"> <attribute name="title"> <string>Render Project</string> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-12-27 00:58:39
|
Revision: 5205 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5205&view=rev Author: j-b-m Date: 2010-12-27 00:58:32 +0000 (Mon, 27 Dec 2010) Log Message: ----------- Remove double margin in config dialog Modified Paths: -------------- trunk/kdenlive/src/widgets/configcapture_ui.ui trunk/kdenlive/src/widgets/configenv_ui.ui trunk/kdenlive/src/widgets/configjogshuttle_ui.ui trunk/kdenlive/src/widgets/configmisc_ui.ui trunk/kdenlive/src/widgets/configproject_ui.ui trunk/kdenlive/src/widgets/configsdl_ui.ui trunk/kdenlive/src/widgets/configtimeline_ui.ui trunk/kdenlive/src/widgets/configtranscode_ui.ui Modified: trunk/kdenlive/src/widgets/configcapture_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/configcapture_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) +++ trunk/kdenlive/src/widgets/configcapture_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) @@ -6,11 +6,17 @@ <rect> <x>0</x> <y>0</y> - <width>409</width> + <width>405</width> <height>470</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_8"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> Modified: trunk/kdenlive/src/widgets/configenv_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/configenv_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) +++ trunk/kdenlive/src/widgets/configenv_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) @@ -6,11 +6,17 @@ <rect> <x>0</x> <y>0</y> - <width>380</width> - <height>225</height> + <width>337</width> + <height>201</height> </rect> </property> <layout class="QGridLayout" name="gridLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> <item row="0" column="0"> <widget class="QCheckBox" name="kcfg_activate_nepomuk"> <property name="text"> Modified: trunk/kdenlive/src/widgets/configjogshuttle_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/configjogshuttle_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) +++ trunk/kdenlive/src/widgets/configjogshuttle_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) @@ -1,114 +1,121 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ConfigJogShuttle_UI</class> - <widget class="QWidget" name="ConfigJogShuttle_UI" > - <property name="geometry" > + <widget class="QWidget" name="ConfigJogShuttle_UI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>325</width> - <height>285</height> + <width>287</width> + <height>253</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" > - <widget class="QCheckBox" name="kcfg_enableshuttle" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <item row="0" column="0"> + <widget class="QCheckBox" name="kcfg_enableshuttle"> + <property name="text"> <string>Enable Jog Shuttle device</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="shuttledisabled" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="shuttledisabled"> + <property name="text"> <string>Jog Shuttle device disabled.</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QGroupBox" name="config_group" > - <property name="enabled" > + <item row="2" column="0"> + <widget class="QGroupBox" name="config_group"> + <property name="enabled"> <bool>false</bool> </property> - <property name="title" > + <property name="title"> <string>Device configuration</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Device</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="KComboBox" name="shuttledevicelist" /> + <item row="0" column="1"> + <widget class="KComboBox" name="shuttledevicelist"/> </item> - <item row="0" column="2" > - <widget class="KLineEdit" name="kcfg_shuttledevice" > - <property name="text" > + <item row="0" column="2"> + <widget class="KLineEdit" name="kcfg_shuttledevice"> + <property name="text"> <string/> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>Button 1</string> </property> </widget> </item> - <item row="1" column="1" colspan="2" > - <widget class="KComboBox" name="shuttle1" /> + <item row="1" column="1" colspan="2"> + <widget class="KComboBox" name="shuttle1"/> </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_4" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> <string>Button 2</string> </property> </widget> </item> - <item row="2" column="1" colspan="2" > - <widget class="KComboBox" name="shuttle2" /> + <item row="2" column="1" colspan="2"> + <widget class="KComboBox" name="shuttle2"/> </item> - <item row="3" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > + <item row="3" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Button 3</string> </property> </widget> </item> - <item row="3" column="1" colspan="2" > - <widget class="KComboBox" name="shuttle3" /> + <item row="3" column="1" colspan="2"> + <widget class="KComboBox" name="shuttle3"/> </item> - <item row="4" column="0" > - <widget class="QLabel" name="label_7" > - <property name="text" > + <item row="4" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> <string>Button 4</string> </property> </widget> </item> - <item row="4" column="1" colspan="2" > - <widget class="KComboBox" name="shuttle4" /> + <item row="4" column="1" colspan="2"> + <widget class="KComboBox" name="shuttle4"/> </item> - <item row="5" column="0" > - <widget class="QLabel" name="label_5" > - <property name="text" > + <item row="5" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> <string>Button 5</string> </property> </widget> </item> - <item row="5" column="1" colspan="2" > - <widget class="KComboBox" name="shuttle5" /> + <item row="5" column="1" colspan="2"> + <widget class="KComboBox" name="shuttle5"/> </item> </layout> </widget> </item> - <item row="3" column="0" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="3" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>56</height> @@ -120,15 +127,15 @@ </widget> <customwidgets> <customwidget> + <class>KLineEdit</class> + <extends>QLineEdit</extends> + <header>klineedit.h</header> + </customwidget> + <customwidget> <class>KComboBox</class> <extends>QComboBox</extends> <header>kcombobox.h</header> </customwidget> - <customwidget> - <class>KLineEdit</class> - <extends>QLineEdit</extends> - <header>klineedit.h</header> - </customwidget> </customwidgets> <resources/> <connections/> Modified: trunk/kdenlive/src/widgets/configmisc_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/configmisc_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) +++ trunk/kdenlive/src/widgets/configmisc_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) @@ -6,11 +6,17 @@ <rect> <x>0</x> <y>0</y> - <width>394</width> - <height>321</height> + <width>374</width> + <height>320</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_4"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> <item row="0" column="0" colspan="3"> <widget class="QCheckBox" name="kcfg_openlastproject"> <property name="text"> Modified: trunk/kdenlive/src/widgets/configproject_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/configproject_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) +++ trunk/kdenlive/src/widgets/configproject_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) @@ -6,14 +6,20 @@ <rect> <x>0</x> <y>0</y> - <width>268</width> - <height>148</height> + <width>262</width> + <height>155</height> </rect> </property> <property name="windowTitle"> <string>Form</string> </property> <layout class="QGridLayout" name="gridLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> <item row="0" column="0" colspan="5"> <widget class="QGroupBox" name="properties"> <property name="title"> Modified: trunk/kdenlive/src/widgets/configsdl_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/configsdl_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) +++ trunk/kdenlive/src/widgets/configsdl_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) @@ -6,11 +6,17 @@ <rect> <x>0</x> <y>0</y> - <width>342</width> - <height>296</height> + <width>336</width> + <height>252</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> <item row="0" column="0" colspan="3"> <widget class="QLabel" name="label_2"> <property name="text"> Modified: trunk/kdenlive/src/widgets/configtimeline_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/configtimeline_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) +++ trunk/kdenlive/src/widgets/configtimeline_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) @@ -6,11 +6,17 @@ <rect> <x>0</x> <y>0</y> - <width>398</width> - <height>213</height> + <width>314</width> + <height>218</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> <item row="0" column="0" colspan="3"> <widget class="QGroupBox" name="groupBox"> <property name="title"> Modified: trunk/kdenlive/src/widgets/configtranscode_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/configtranscode_ui.ui 2010-12-27 00:51:50 UTC (rev 5204) +++ trunk/kdenlive/src/widgets/configtranscode_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) @@ -6,11 +6,17 @@ <rect> <x>0</x> <y>0</y> - <width>440</width> - <height>237</height> + <width>366</width> + <height>183</height> </rect> </property> <layout class="QGridLayout" name="gridLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> <item row="0" column="0" colspan="3"> <widget class="QTreeWidget" name="profiles_list"> <property name="alternatingRowColors"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-12-27 01:18:33
|
Revision: 5206 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5206&view=rev Author: j-b-m Date: 2010-12-27 01:18:27 +0000 (Mon, 27 Dec 2010) Log Message: ----------- UI cleanup (remove double margin) Modified Paths: -------------- trunk/kdenlive/src/widgets/dvdwizardchapters_ui.ui trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui Modified: trunk/kdenlive/src/widgets/dvdwizardchapters_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardchapters_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) +++ trunk/kdenlive/src/widgets/dvdwizardchapters_ui.ui 2010-12-27 01:18:27 UTC (rev 5206) @@ -6,11 +6,14 @@ <rect> <x>0</x> <y>0</y> - <width>344</width> - <height>369</height> + <width>254</width> + <height>283</height> </rect> </property> <layout class="QGridLayout" name="gridLayout"> + <property name="margin"> + <number>0</number> + </property> <item row="1" column="0"> <widget class="QLabel" name="label"> <property name="text"> Modified: trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) +++ trunk/kdenlive/src/widgets/dvdwizardmenu_ui.ui 2010-12-27 01:18:27 UTC (rev 5206) @@ -6,11 +6,14 @@ <rect> <x>0</x> <y>0</y> - <width>549</width> - <height>451</height> + <width>335</width> + <height>371</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_5"> + <property name="margin"> + <number>0</number> + </property> <item row="0" column="0"> <widget class="QCheckBox" name="create_menu"> <property name="text"> @@ -23,7 +26,13 @@ <property name="title"> <string/> </property> + <property name="flat"> + <bool>true</bool> + </property> <layout class="QGridLayout" name="gridLayout"> + <property name="margin"> + <number>0</number> + </property> <item row="0" column="0" colspan="2"> <widget class="QTabWidget" name="tabWidget"> <property name="sizePolicy"> Modified: trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) +++ trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2010-12-27 01:18:27 UTC (rev 5206) @@ -6,11 +6,14 @@ <rect> <x>0</x> <y>0</y> - <width>333</width> - <height>313</height> + <width>293</width> + <height>287</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> + <property name="margin"> + <number>0</number> + </property> <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> Modified: trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui 2010-12-27 00:58:32 UTC (rev 5205) +++ trunk/kdenlive/src/widgets/dvdwizardvob_ui.ui 2010-12-27 01:18:27 UTC (rev 5206) @@ -6,11 +6,14 @@ <rect> <x>0</x> <y>0</y> - <width>342</width> - <height>287</height> + <width>319</width> + <height>248</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> + <property name="margin"> + <number>0</number> + </property> <item row="1" column="0" colspan="2"> <widget class="QCheckBox" name="use_intro"> <property name="text"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tt...@us...> - 2011-01-09 10:30:56
|
Revision: 5311 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5311&view=rev Author: ttill Date: 2011-01-09 10:30:50 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Fix comment labels for list and bool parameters getting very wide Modified Paths: -------------- trunk/kdenlive/src/widgets/boolval_ui.ui trunk/kdenlive/src/widgets/listval_ui.ui Modified: trunk/kdenlive/src/widgets/boolval_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/boolval_ui.ui 2011-01-08 23:12:15 UTC (rev 5310) +++ trunk/kdenlive/src/widgets/boolval_ui.ui 2011-01-09 10:30:50 UTC (rev 5311) @@ -57,6 +57,12 @@ <property name="textFormat"> <enum>Qt::RichText</enum> </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> </item> </layout> Modified: trunk/kdenlive/src/widgets/listval_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/listval_ui.ui 2011-01-08 23:12:15 UTC (rev 5310) +++ trunk/kdenlive/src/widgets/listval_ui.ui 2011-01-09 10:30:50 UTC (rev 5311) @@ -53,6 +53,12 @@ <property name="textFormat"> <enum>Qt::RichText</enum> </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> </item> </layout> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2011-07-10 07:17:30
|
Revision: 5781 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5781&view=rev Author: yurchor Date: 2011-07-10 07:17:24 +0000 (Sun, 10 Jul 2011) Log Message: ----------- Do not extract things that should not be extracted. Modified Paths: -------------- trunk/kdenlive/src/widgets/colorplaneexport_ui.ui trunk/kdenlive/src/widgets/vectorscope_ui.ui Modified: trunk/kdenlive/src/widgets/colorplaneexport_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/colorplaneexport_ui.ui 2011-07-09 20:58:42 UTC (rev 5780) +++ trunk/kdenlive/src/widgets/colorplaneexport_ui.ui 2011-07-10 07:17:24 UTC (rev 5781) @@ -47,7 +47,7 @@ <item row="2" column="0"> <widget class="QLabel" name="lblSliderName"> <property name="text"> - <string notr="true">(notransl.)</string> + <string comment="KDE::DoNotExtract">(notransl.)</string> </property> </widget> </item> @@ -64,7 +64,7 @@ <item row="2" column="3"> <widget class="QLabel" name="lblColNr"> <property name="text"> - <string notr="true">(notranslate) Y display</string> + <string comment="KDE::DoNotExtract">(notranslate) Y display</string> </property> </widget> </item> @@ -91,7 +91,7 @@ <item row="3" column="3"> <widget class="QLabel" name="lblScaleNr"> <property name="text"> - <string>(notranslate) % display</string> + <string comment="KDE::DoNotExtract">(notranslate) % display</string> </property> </widget> </item> @@ -131,7 +131,7 @@ </font> </property> <property name="text"> - <string notr="true">(notranslate) Total pixels go here</string> + <string comment="KDE::DoNotExtract">(notranslate) Total pixels go here</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> Modified: trunk/kdenlive/src/widgets/vectorscope_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/vectorscope_ui.ui 2011-07-09 20:58:42 UTC (rev 5780) +++ trunk/kdenlive/src/widgets/vectorscope_ui.ui 2011-07-10 07:17:24 UTC (rev 5781) @@ -89,7 +89,7 @@ <item row="1" column="4" colspan="2"> <widget class="QLabel" name="lblGain"> <property name="text"> - <string>(notr)</string> + <string comment="KDE::DoNotExtract">(notr)</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |