Minor tweaks to GUI appearance, etc.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4210 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2014-07-23 17:16:35 +00:00
parent 32b84196fc
commit c88d694bc3
4 changed files with 15 additions and 16 deletions

View File

@ -750,7 +750,7 @@ Configuration::impl::impl (Configuration * self, QString const& instance_key, QS
ui_->frequencies_table_view->insertAction (nullptr, frequency_delete_action_); ui_->frequencies_table_view->insertAction (nullptr, frequency_delete_action_);
connect (frequency_delete_action_, &QAction::triggered, this, &Configuration::impl::delete_frequencies); connect (frequency_delete_action_, &QAction::triggered, this, &Configuration::impl::delete_frequencies);
frequency_insert_action_ = new QAction {tr ("&Insert ..."), ui_->frequencies_table_view}; frequency_insert_action_ = new QAction {tr ("&Insert"), ui_->frequencies_table_view};
ui_->frequencies_table_view->insertAction (nullptr, frequency_insert_action_); ui_->frequencies_table_view->insertAction (nullptr, frequency_insert_action_);
connect (frequency_insert_action_, &QAction::triggered, this, &Configuration::impl::insert_frequency); connect (frequency_insert_action_, &QAction::triggered, this, &Configuration::impl::insert_frequency);
@ -770,7 +770,7 @@ Configuration::impl::impl (Configuration * self, QString const& instance_key, QS
ui_->stations_table_view->insertAction (nullptr, station_delete_action_); ui_->stations_table_view->insertAction (nullptr, station_delete_action_);
connect (station_delete_action_, &QAction::triggered, this, &Configuration::impl::delete_stations); connect (station_delete_action_, &QAction::triggered, this, &Configuration::impl::delete_stations);
station_insert_action_ = new QAction {tr ("&Insert ..."), ui_->stations_table_view}; station_insert_action_ = new QAction {tr ("&Insert"), ui_->stations_table_view};
ui_->stations_table_view->insertAction (nullptr, station_insert_action_); ui_->stations_table_view->insertAction (nullptr, station_insert_action_);
connect (station_insert_action_, &QAction::triggered, this, &Configuration::impl::insert_station); connect (station_insert_action_, &QAction::triggered, this, &Configuration::impl::insert_station);
@ -1147,10 +1147,9 @@ void Configuration::impl::set_rig_invariants ()
ui_->CAT_control_group_box->setEnabled (true); ui_->CAT_control_group_box->setEnabled (true);
ui_->CAT_port_label->setText (tr ("Network Server:")); ui_->CAT_port_label->setText (tr ("Network Server:"));
ui_->CAT_port_combo_box->setToolTip (tr ("Optional hostname and port of network service\n" ui_->CAT_port_combo_box->setToolTip (tr ("Optional hostname and port of network service.\n"
"You can usually leave this blank\n" "Leave blank for a sensible default on this machine.\n"
"for a sensible default on this machine\n" "Formats:\n"
"formats:\n"
"\thostname:port\n" "\thostname:port\n"
"\tIPv4-address:port\n" "\tIPv4-address:port\n"
"\t[IPv6-address]:port")); "\t[IPv6-address]:port"));

View File

@ -211,7 +211,7 @@
<item> <item>
<widget class="QGroupBox" name="behaviour_group_box"> <widget class="QGroupBox" name="behaviour_group_box">
<property name="title"> <property name="title">
<string>Behaviour</string> <string>Behavior</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_8"> <layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0"> <item row="0" column="0">
@ -902,7 +902,7 @@ this setting allows you to select which audio input will be used
<item> <item>
<widget class="QLabel" name="CAT_poll_interval_label"> <widget class="QLabel" name="CAT_poll_interval_label">
<property name="text"> <property name="text">
<string>Poll Interval:</string> <string>Poll Interval (s):</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>CAT_poll_interval_spin_box</cstring> <cstring>CAT_poll_interval_spin_box</cstring>
@ -1821,12 +1821,12 @@ soundcard changes</string>
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/> <buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="split_mode_button_group"/> <buttongroup name="split_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="TX_mode_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

View File

@ -129,10 +129,10 @@ namespace
ui_.setupUi (this); ui_.setupUi (this);
// context menu actions // context menu actions
auto import_button = ui_.button_box->addButton ("&Import...", QDialogButtonBox::ActionRole); auto import_button = ui_.button_box->addButton ("&Import", QDialogButtonBox::ActionRole);
connect (import_button, &QPushButton::clicked, this, &Designer::import_palette); connect (import_button, &QPushButton::clicked, this, &Designer::import_palette);
auto export_button = ui_.button_box->addButton ("&Export...", QDialogButtonBox::ActionRole); auto export_button = ui_.button_box->addButton ("&Export", QDialogButtonBox::ActionRole);
connect (export_button, &QPushButton::clicked, this, &Designer::export_palette); connect (export_button, &QPushButton::clicked, this, &Designer::export_palette);
// hookup the context menu handler // hookup the context menu handler
@ -203,7 +203,7 @@ namespace
}); });
} }
auto insert_action = context_menu_.addAction (tr ("&Insert ...")); auto insert_action = context_menu_.addAction (tr ("&Insert"));
connect (insert_action, &QAction::triggered, [this] () connect (insert_action, &QAction::triggered, [this] ()
{ {
auto item = ui_.colour_table_widget->itemAt (menu_pos_); auto item = ui_.colour_table_widget->itemAt (menu_pos_);
@ -211,7 +211,7 @@ namespace
insert_new_item (row, QColor {0, 0, 0}); insert_new_item (row, QColor {0, 0, 0});
}); });
auto insert_after_action = context_menu_.addAction (tr ("Insert &after ...")); auto insert_after_action = context_menu_.addAction (tr ("Insert &after"));
connect (insert_after_action, &QAction::triggered, [this] () connect (insert_after_action, &QAction::triggered, [this] ()
{ {
auto item = ui_.colour_table_widget->itemAt (menu_pos_); auto item = ui_.colour_table_widget->itemAt (menu_pos_);

View File

@ -2681,7 +2681,7 @@ list. The list can be maintained in Settings (F2).</string>
</action> </action>
<action name="actionSettings"> <action name="actionSettings">
<property name="text"> <property name="text">
<string>Settings ...</string> <string>Configuration</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>F2</string> <string>F2</string>