Group CSSU/CSSI and incomming call UI together on the same "Call" tab --- src/controlbase.ui | 267 ++++++++++++++++++++++++++-------------------------- 1 files changed, 132 insertions(+), 135 deletions(-) diff --git a/src/controlbase.ui b/src/controlbase.ui index 41c6d12..dd60cda 100644 --- a/src/controlbase.ui +++ b/src/controlbase.ui @@ -113,144 +113,34 @@ </widget> </item> <item> - <widget class="QGroupBox" name="gbIncomingCall"> - <property name="title"> - <string>Incoming Call</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QCheckBox" name="cbCaller"> - <property name="text"> - <string>Caller Identity</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="leCaller"/> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="cbCallerName"> - <property name="text"> - <string>Caller Name</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="leCallerName"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="cbCalledLine"> - <property name="text"> - <string>Called Line</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="leCalledLine"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2"> - <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>111</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="pbIncomingCall"> - <property name="text"> - <string>&amp;Call</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> <property name="sizeHint" stdset="0"> <size> - <width>322</width> + <width>40</width> <height>20</height> </size> </property> </spacer> </item> - <item> - <widget class="QGroupBox" name="gbCallSettings"> - <property name="title"> - <string>Call Settings</string> - </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="1"> - <widget class="QComboBox" name="cbCSSU"/> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="cbCSSI"/> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="lbCSSU"> - <property name="text"> - <string>CSSU</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="lbCSSI"> - <property name="text"> - <string>CSSI</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QPushButton" name="pbSendNotif"> - <property name="text"> - <string>Send Notification</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> </layout> </item> <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>10</height> + </size> + </property> + </spacer> + </item> + <item> <widget class="QCheckBox" name="atCheckBox"> <property name="layoutDirection"> <enum>Qt::RightToLeft</enum> @@ -1505,17 +1395,124 @@ p, li { white-space: pre-wrap; } </widget> </item> <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QGroupBox" name="gbIncomingCall"> + <property name="title"> + <string>Incoming Call</string> + </property> + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="cbCaller"> + <property name="text"> + <string>Caller Identity</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="leCaller"/> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="cbCallerName"> + <property name="text"> + <string>Caller Name</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="leCallerName"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="cbCalledLine"> + <property name="text"> + <string>Called Line</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="leCalledLine"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>111</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pbIncomingCall"> + <property name="text"> + <string>&amp;Call</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="gbCallSettings"> + <property name="title"> + <string>Call Settings</string> + </property> + <layout class="QGridLayout"> + <item row="0" column="1"> + <widget class="QComboBox" name="cbCSSU"/> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="cbCSSI"/> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="lbCSSU"> + <property name="text"> + <string>CSSU</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="lbCSSI"> + <property name="text"> + <string>CSSI</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="pbSendNotif"> + <property name="text"> + <string>Send Notification</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> </item> </layout> </widget> -- 1.7.1