diff options
author | Micah Anderson <micah@riseup.net> | 2013-08-27 12:20:29 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-08-27 12:20:29 -0400 |
commit | 4951157e3740b42ecef6775c8927b912a6ee8870 (patch) | |
tree | 00e7bf6c9d14106c8b06dd030b90d130fa8c40bd /src/leap/bitmask/gui/ui/mainwindow.ui | |
parent | 1b4458bfc2ce97ec02180793eca0fcca38be4f84 (diff) | |
parent | 5997cb2c8c2aa2af18079f9a9505731f498fb9a4 (diff) |
Merge remote-tracking branch 'leapcode/debian' into debian
Conflicts:
MANIFEST.in
debian/changelog
debian/copyright
Diffstat (limited to 'src/leap/bitmask/gui/ui/mainwindow.ui')
-rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index 9c4e6ff0..834a562e 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -215,6 +215,16 @@ <item row="18" column="2"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> + <widget class="QPushButton" name="btnPreferences"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Preferences</string> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_10"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -310,7 +320,6 @@ <resources> <include location="../../../../../data/resources/mainwindow.qrc"/> <include location="../../../../../data/resources/locale.qrc"/> - <include location="../../../../data/resources/mainwindow.qrc"/> </resources> <connections/> </ui> |