Changeset 307 for branches

Timestamp:

12/28/09 01:38:53 (2 years ago)

Author:

antonbatenev.ya.ru

Message:

fix #83 - шоткаты при составлении сообщения

Location:

branches/1.0rc3

Files:

• . (copied) (copied from tags/1.0rc2)
• form_message_ui.cpp (modified) (3 diffs)
• version.cpp (modified) (1 diff)
• version.h (modified) (1 diff)

branches/1.0rc3/form_message_ui.cpp

@@ -27 +27 @@
         m_button_send = new QAction(m_toolbar_message);
         m_button_send->setIcon(QIcon(":/icons/reply24.png"));
-        m_button_send->setText(QString::fromUtf8("отправить"));
+        m_button_send->setText(QString::fromUtf8("отправить [CTRL + S]"));
+        m_button_send->setShortcut(QString("CTRL+S"));
 
         m_toolbar_message->addAction(m_button_send);
@@ -33 +34 @@
         m_button_draft = new QAction(m_toolbar_message);
         m_button_draft->setIcon(QIcon(":/icons/draft24.png"));
-        m_button_draft->setText(QString::fromUtf8("в черновики"));
+        m_button_draft->setText(QString::fromUtf8("в черновики [CTRL + D]"));
+        m_button_draft->setShortcut(QString("CTRL+D"));
 
         m_toolbar_message->addAction(m_button_draft);
@@ -103 +105 @@
         m_button_bold = new QAction(m_toolbar_message);
         m_button_bold->setIcon(QIcon(":/icons/bold24.png"));
-        m_button_bold->setText(QString::fromUtf8("жирный"));
+        m_button_bold->setText(QString::fromUtf8("жирный [CTRL + B]"));
+        m_button_bold->setShortcut(QString("Ctrl+B"));
         m_toolbar_message->addAction(m_button_bold);
 
         m_button_italic = new QAction(m_toolbar_message);
         m_button_italic->setIcon(QIcon(":/icons/italic24.png"));
-        m_button_italic->setText(QString::fromUtf8("курсив"));
+        m_button_italic->setText(QString::fromUtf8("курсив [CTRL + I]"));
+        m_button_italic->setShortcut(QString("Ctrl+I"));
         m_toolbar_message->addAction(m_button_italic);
 
         m_button_quote = new QAction(m_toolbar_message);
         m_button_quote->setIcon(QIcon(":/icons/quote24.png"));
-        m_button_quote->setText(QString::fromUtf8("цитирование"));
+        m_button_quote->setText(QString::fromUtf8("цитирование [CTRL + Q]"));
+        m_button_quote->setShortcut(QString("Ctrl+Q"));
         m_toolbar_message->addAction(m_button_quote);
 
         m_button_image = new QAction(m_toolbar_message);
         m_button_image->setIcon(QIcon(":/icons/image24.png"));
-        m_button_image->setText(QString::fromUtf8("рисунок"));
+        m_button_image->setText(QString::fromUtf8("рисунок [CTRL + G]"));
+        m_button_image->setShortcut(QString("Ctrl+G"));
         m_toolbar_message->addAction(m_button_image);
 
         m_button_hyperlink = new QAction(m_toolbar_message);
         m_button_hyperlink->setIcon(QIcon(":/icons/hyperlink24.png"));
-        m_button_hyperlink->setText(QString::fromUtf8("ссылка"));
+        m_button_hyperlink->setText(QString::fromUtf8("ссылка [CTRL + H]"));
+        m_button_hyperlink->setShortcut(QString("Ctrl+H"));
         m_toolbar_message->addAction(m_button_hyperlink);
 
         m_button_code = new QAction(m_toolbar_message);
         m_button_code->setIcon(QIcon(":/icons/code24.png"));
-        m_button_code->setText(QString::fromUtf8("код"));
+        m_button_code->setText(QString::fromUtf8("код [CTRL + O]"));
+        m_button_code->setShortcut(QString("Ctrl+O"));
 
         m_menu_code = new QMenu(m_toolbar_message);

branches/1.0rc3/version.cpp

@@ -16 +16 @@
         revision.replace(" $", "");
 
-        QString result = QString("avalon 1.0rc2 rev ") + revision;
+        QString result = QString("avalon 1.0rc3 rev ") + revision;
 
 #ifdef AVALON_USE_ZLIB

branches/1.0rc3/version.h

@@ -20 +20 @@
  * \brief Дата билда (заменяется автоматически при каждом билде в version.h, что и приводит к смене номера ревизии)
  */
-#define AVALON_DATE "Срд Сен 23 16:46:13 MSD 2009"
+#define AVALON_DATE "Пнд Дек 28 00:39:08 MSK 2009"
 
 #endif