Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorder XML .ui files to correct tab orders #943

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/app-chooser-dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,6 @@
<item row="1" column="0" colspan="2">
<widget class="QLineEdit" name="cmdLine"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Application name:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="appName"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_5">
<property name="text">
Expand All @@ -82,23 +72,33 @@
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="keepTermOpen">
<property name="enabled">
<bool>false</bool>
</property>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Keep terminal window open after command execution</string>
<string>Application name:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="appName"/>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="useTerminal">
<property name="text">
<string>Execute in terminal emulator</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="keepTermOpen">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Keep terminal window open after command execution</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
Expand Down
14 changes: 7 additions & 7 deletions src/edit-bookmarks.ui
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<string>Edit Bookmarks</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Use drag and drop to reorder the items</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QTreeWidget" name="treeWidget">
<property name="acceptDrops">
Expand Down Expand Up @@ -96,13 +103,6 @@
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Use drag and drop to reorder the items</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down
48 changes: 24 additions & 24 deletions src/file-operation-dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0" colspan="2">
<widget class="QListWidget" name="sourceFiles">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="destLabel">
<property name="text">
Expand Down Expand Up @@ -83,6 +93,20 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Files processed:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="filesProcessed">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
Expand All @@ -109,30 +133,6 @@
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QListWidget" name="sourceFiles">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Files processed:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="filesProcessed">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
Expand Down
138 changes: 69 additions & 69 deletions src/file-props.ui
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,32 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="targetLabel">
<property name="text">
<string>Link target:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="target">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
Expand Down Expand Up @@ -146,6 +172,23 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="openWithLabel">
<property name="text">
<string>Open With:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="Fm::AppChooserComboBox" name="openWith">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
Expand Down Expand Up @@ -215,49 +258,6 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="targetLabel">
<property name="text">
<string>Link target:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="target">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="openWithLabel">
<property name="text">
<string>Open With:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="Fm::AppChooserComboBox" name="openWith">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
Expand Down Expand Up @@ -391,6 +391,13 @@
<property name="verticalSpacing">
<number>5</number>
</property>
<item row="0" column="0" rowspan="2" alignment="Qt::AlignVCenter">
<widget class="QLabel" name="deviceLabel">
<property name="text">
<string>Device Usage:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QProgressBar" name="progressBar">
<property name="value">
Expand All @@ -408,13 +415,6 @@
</property>
</widget>
</item>
<item row="0" column="0" rowspan="2" alignment="Qt::AlignVCenter">
<widget class="QLabel" name="deviceLabel">
<property name="text">
<string>Device Usage:</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
Expand Down Expand Up @@ -445,38 +445,38 @@
<property name="verticalSpacing">
<number>6</number>
</property>
<item row="1" column="1">
<widget class="QLineEdit" name="owner"/>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="ownerGroup"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_9">
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Group:</string>
<string>Owner:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<item row="1" column="1">
<widget class="QLineEdit" name="owner"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Owner:</string>
<string>Group:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="ownerGroup"/>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -736,6 +736,13 @@
</item>
</layout>
</item>
<item row="0" column="1" rowspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="checkBox_10">
<property name="text">
Expand All @@ -757,13 +764,6 @@
</property>
</widget>
</item>
<item row="0" column="1" rowspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
Expand Down
Loading