diff options
| author | micah <micah@riseup.net> | 2013-08-27 08:31:16 -0700 |
|---|---|---|
| committer | micah <micah@riseup.net> | 2013-08-27 08:31:16 -0700 |
| commit | 5997cb2c8c2aa2af18079f9a9505731f498fb9a4 (patch) | |
| tree | 0b0f74fbd7ec8119171a1aa355e9e95b0193395e /src/leap/bitmask/gui/ui/mainwindow.ui | |
| parent | 655a9a610cfe69530b8f6fde41e9255435374253 (diff) | |
| parent | a894346b666b657dec99c41783e4c862777b62b3 (diff) | |
Merge pull request #276 from kalikaneko/debian-0.3.1
Debian 0.3.1
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> |