Hi!
Please find attached diffs that should fix the following:
jabber_ui.diff - when "Manually specify Jabber host" field is empty it should be disabled.
shortcuts_icons.diff - shortcuts in popup menu changed for "Copy" command from "Ctrl+S" to "Ctrl+C" and the rest of commands ("Open Message", "Quote", etc.) have no shortcuts assigned now (previous shortcuts were "Ctrl+S" also due to cmd->accel reuse from the last assignment in code). Also cmd->icon for commands "Quote" and "Forward" (they have no icons) changed from "empty" to NULL because "empty" icon looks very ugly when menu item is selected.
Please review changes and if they are acceptable please commit them into SVN.
Thanks,
Mark
Index: plugins/jabber/jabberconfigbase.ui
===================================================================
--- plugins/jabber/jabberconfigbase.ui (revision 1174)
+++ plugins/jabber/jabberconfigbase.ui (working copy)
@@ -651,6 +651,9 @@
<name>name</name>
<cstring>edtVHost</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
</widget>
<widget row="6" column="0" rowspan="1" colspan="3" >
<class>QCheckBox</class>
Index: plugins/jabber/jabberconfig.cpp
===================================================================
--- plugins/jabber/jabberconfig.cpp (revision 1174)
+++ plugins/jabber/jabberconfig.cpp (working copy)
@@ -67,6 +67,7 @@
edtMinPort->setValue(m_client->getMinPort());
edtMaxPort->setValue(m_client->getMaxPort());
chkVHost->setChecked(m_client->getUseVHost());
+ toggledVHost(m_client->getUseVHost());
chkTyping->setChecked(m_client->getTyping());
chkRichText->setChecked(m_client->getRichText());
chkIcons->setChecked(m_client->getProtocolIcons());
Index: plugins/_core/core.cpp
===================================================================
--- plugins/_core/core.cpp (revision 1174)
+++ plugins/_core/core.cpp (working copy)
@@ -900,6 +900,7 @@
cmd->id = CmdMsgOpen;
cmd->text = I18N_NOOP("&Open message");
+ cmd->accel = NULL;
cmd->icon = "message";
cmd->icon_on = NULL;
cmd->menu_id = MenuMsgView;
@@ -917,12 +918,14 @@
cmd->id = CmdCopy;
cmd->text = I18N_NOOP("&Copy");
+ cmd->accel = "Ctrl+C";
cmd->icon = "editcopy";
cmd->menu_grp = 0x2000;
eCmd.process();
cmd->id = CmdDeleteMessage;
cmd->text = I18N_NOOP("&Delete message");
+ cmd->accel = NULL;
cmd->icon = "remove";
cmd->menu_grp = 0x3000;
eCmd.process();
@@ -934,7 +937,7 @@
cmd->id = CmdMsgQuote;
cmd->text = I18N_NOOP("&Quote");
- cmd->icon = "empty";
+ cmd->icon = NULL;
cmd->menu_id = MenuMsgCommand;
cmd->menu_grp = 0x1002;
_______________________________________________ sim-im-main mailing list [email protected] https://mailman.dg.net.ua/listinfo/sim-im-main
