mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-10-01 01:06:35 -04:00
Commands and presets: tabify dock widgets. Changed placement of the delete button
This commit is contained in:
parent
5d7ffe7a50
commit
9435c7446f
@ -534,6 +534,8 @@ void MainWindow::loadSettings()
|
|||||||
treeItem = addCommandToTree(m_settings.getCommand(i));
|
treeItem = addCommandToTree(m_settings.getCommand(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tabifyDockWidget(ui->presetDock, ui->commandsDock);
|
||||||
|
|
||||||
setLoggingOptions();
|
setLoggingOptions();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -318,7 +318,101 @@
|
|||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>3</number>
|
<number>3</number>
|
||||||
</property>
|
</property>
|
||||||
<item row="1" column="1" rowspan="2" colspan="12">
|
<item row="5" column="2">
|
||||||
|
<widget class="QToolButton" name="presetUpdate">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Update selected preset with current settings</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>...</string>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="resources/res.qrc">
|
||||||
|
<normaloff>:/recycle.png</normaloff>:/recycle.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="iconSize">
|
||||||
|
<size>
|
||||||
|
<width>16</width>
|
||||||
|
<height>16</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="4">
|
||||||
|
<widget class="QToolButton" name="presetEdit">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Edit preset details</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="resources/res.qrc">
|
||||||
|
<normaloff>:/edit.png</normaloff>:/edit.png</iconset>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="5">
|
||||||
|
<widget class="QToolButton" name="presetExport">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Export current preset to file</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="resources/res.qrc">
|
||||||
|
<normaloff>:/export.png</normaloff>:/export.png</iconset>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="7">
|
||||||
|
<spacer name="horizontalSpacer_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="9">
|
||||||
|
<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>
|
||||||
|
<item row="5" column="3">
|
||||||
|
<widget class="QToolButton" name="settingsSave">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Save the current settings (inc. presets)</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>...</string>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="resources/res.qrc">
|
||||||
|
<normaloff>:/save.png</normaloff>:/save.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="iconSize">
|
||||||
|
<size>
|
||||||
|
<width>16</width>
|
||||||
|
<height>16</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1" rowspan="2" colspan="13">
|
||||||
<widget class="QTreeWidget" name="presetTree">
|
<widget class="QTreeWidget" name="presetTree">
|
||||||
<property name="indentation">
|
<property name="indentation">
|
||||||
<number>10</number>
|
<number>10</number>
|
||||||
@ -352,18 +446,19 @@
|
|||||||
</column>
|
</column>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="9">
|
<item row="5" column="6">
|
||||||
<spacer name="horizontalSpacer">
|
<widget class="QToolButton" name="presetImport">
|
||||||
<property name="orientation">
|
<property name="toolTip">
|
||||||
<enum>Qt::Horizontal</enum>
|
<string>Import preset from file into current group</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0">
|
<property name="text">
|
||||||
<size>
|
<string/>
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
<property name="icon">
|
||||||
|
<iconset resource="resources/res.qrc">
|
||||||
|
<normaloff>:/import.png</normaloff>:/import.png</iconset>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="1">
|
<item row="5" column="1">
|
||||||
<widget class="QToolButton" name="presetSave">
|
<widget class="QToolButton" name="presetSave">
|
||||||
@ -386,94 +481,6 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="10">
|
<item row="5" column="10">
|
||||||
<widget class="QToolButton" name="presetDelete">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Delete selected preset</string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>...</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="resources/res.qrc">
|
|
||||||
<normaloff>:/bin.png</normaloff>:/bin.png</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="iconSize">
|
|
||||||
<size>
|
|
||||||
<width>16</width>
|
|
||||||
<height>16</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="2">
|
|
||||||
<widget class="QToolButton" name="presetUpdate">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Update selected preset with current settings</string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>...</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="resources/res.qrc">
|
|
||||||
<normaloff>:/recycle.png</normaloff>:/recycle.png</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="iconSize">
|
|
||||||
<size>
|
|
||||||
<width>16</width>
|
|
||||||
<height>16</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="6">
|
|
||||||
<widget class="QToolButton" name="presetImport">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Import preset from file into current group</string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="resources/res.qrc">
|
|
||||||
<normaloff>:/import.png</normaloff>:/import.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="5">
|
|
||||||
<widget class="QToolButton" name="presetExport">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Export current preset to file</string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="resources/res.qrc">
|
|
||||||
<normaloff>:/export.png</normaloff>:/export.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="3">
|
|
||||||
<widget class="QToolButton" name="settingsSave">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Save the current settings (inc. presets)</string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>...</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="resources/res.qrc">
|
|
||||||
<normaloff>:/save.png</normaloff>:/save.png</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="iconSize">
|
|
||||||
<size>
|
|
||||||
<width>16</width>
|
|
||||||
<height>16</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="8">
|
|
||||||
<widget class="QToolButton" name="presetLoad">
|
<widget class="QToolButton" name="presetLoad">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Load selected preset</string>
|
<string>Load selected preset</string>
|
||||||
@ -493,30 +500,23 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="7">
|
<item row="5" column="8">
|
||||||
<spacer name="horizontalSpacer_2">
|
<widget class="QToolButton" name="presetDelete">
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="4">
|
|
||||||
<widget class="QToolButton" name="presetEdit">
|
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Edit preset details</string>
|
<string>Delete selected preset</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string>...</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="resources/res.qrc">
|
<iconset resource="resources/res.qrc">
|
||||||
<normaloff>:/edit.png</normaloff>:/edit.png</iconset>
|
<normaloff>:/bin.png</normaloff>:/bin.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="iconSize">
|
||||||
|
<size>
|
||||||
|
<width>16</width>
|
||||||
|
<height>16</height>
|
||||||
|
</size>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -727,16 +727,16 @@
|
|||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="ButtonSwitch" name="commandKeyboardConnect">
|
<widget class="QToolButton" name="commandDelete">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Toggle keyboard to command connection</string>
|
<string>Delete selected command</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="resources/res.qrc">
|
<iconset resource="resources/res.qrc">
|
||||||
<normaloff>:/keyboard.png</normaloff>:/keyboard.png</iconset>
|
<normaloff>:/bin.png</normaloff>:/bin.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -754,16 +754,16 @@
|
|||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="commandDelete">
|
<widget class="ButtonSwitch" name="commandKeyboardConnect">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Delete selected command</string>
|
<string>Toggle keyboard to command connection</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="resources/res.qrc">
|
<iconset resource="resources/res.qrc">
|
||||||
<normaloff>:/bin.png</normaloff>:/bin.png</iconset>
|
<normaloff>:/keyboard.png</normaloff>:/keyboard.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -925,7 +925,6 @@
|
|||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>presetTree</tabstop>
|
<tabstop>presetTree</tabstop>
|
||||||
<tabstop>presetSave</tabstop>
|
<tabstop>presetSave</tabstop>
|
||||||
<tabstop>presetDelete</tabstop>
|
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources>
|
<resources>
|
||||||
<include location="resources/res.qrc"/>
|
<include location="resources/res.qrc"/>
|
||||||
|
Loading…
Reference in New Issue
Block a user