Настройки -> Действия по двойному клику по заголовку: добавлено "Сохр…

…анить заметку". Обновлена локализация. Рефакторинг. Signed-off-by: gil9red <[email protected]>
gil9red · May 9, 2014 · 593f77a · 593f77a
1 parent 6aec986
commit 593f77a
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 184 deletions.
diff --git a/Manager/pages/page_settings.cpp b/Manager/pages/page_settings.cpp
@@ -46,12 +46,13 @@ Page_Settings::Page_Settings( QWidget * parent )
     ui->lEditViewTitle->setPalette( palette );
 
     ui->comboBoxActionsDoubleClickOnTitleNote->clear();
-    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "do nothing" ), Shared::DoNothing );
-    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "edit the title" ), Shared::EditTitle );
-    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "hide note" ), Shared::HideNote );
+    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "do nothing" ),      Shared::DoNothing );
+    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "edit note title" ), Shared::EditTitleNote );
+    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "hide note" ),       Shared::HideNote );
     ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "delete the note" ), Shared::DeleteNote );
-    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "save as" ), Shared::SaveAs );
-    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "print notes" ), Shared::PrintNotes );
+    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "save note" ),       Shared::SaveNote );
+    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "save note as" ),    Shared::SaveNoteAs );
+    ui->comboBoxActionsDoubleClickOnTitleNote->addItem( tr( "print note" ),      Shared::PrintNotes );
 }
 
 Page_Settings::~Page_Settings()
@@ -99,7 +100,7 @@ void Page_Settings::mapToSettings()
 
     ui->checkBoxAutosaveNotes->setChecked( mapSettings.value( "Notes_Autosave", true ).toBool() );
     ui->sBoxAutosaveIntervalNotes->setValue( mapSettings.value( "Notes_AutosaveInterval", 7 ).toInt() );    
-    index = ui->comboBoxActionsDoubleClickOnTitleNote->findData( mapSettings.value( "Notes_ActionDoubleClickOnTitle", Shared::EditTitle ) );
+    index = ui->comboBoxActionsDoubleClickOnTitleNote->findData( mapSettings.value( "Notes_ActionDoubleClickOnTitle", Shared::EditTitleNote ) );
     ui->comboBoxActionsDoubleClickOnTitleNote->setCurrentIndex( index );
 }
 void Page_Settings::settingsToMap()

diff --git a/Note/NoteShared.h b/Note/NoteShared.h
@@ -12,23 +12,24 @@ namespace Shared
     /*! Перечисление сторон рамки заметки. */
     enum Side
     {
-        Left = 0x0001,  //!< Левая
-        Right = 0x0002, //!< Правая
-        Top = 0x0004,   //!< Верхняя
-        Bottom = 0x0008 //!< Нижняя
+        Left   = 0x0001, //!< Левая
+        Right  = 0x0002, //!< Правая
+        Top    = 0x0004, //!< Верхняя
+        Bottom = 0x0008  //!< Нижняя
     };
     Q_DECLARE_FLAGS ( Sides, Side )
 
 
     //! Действия при двойном клике на заголовок
     enum ActionDoubleClickingOnTitle
     {
-        DoNothing,  //!< Ничего не делать.
-        EditTitle,  //!< Редактировать заголовок.
-        HideNote,   //!< Скрыть заметку.
-        DeleteNote, //!< Удалить заметку.
-        SaveAs,     //!< Сохранить заметку как....
-        PrintNotes  //!< Печать заметки.
+        DoNothing,     //!< Ничего не делать.
+        EditTitleNote, //!< Редактировать заголовок.
+        HideNote,      //!< Скрыть заметку.
+        DeleteNote,    //!< Удалить заметку.
+        SaveNote,      //!< Сохранить заметку.
+        SaveNoteAs,    //!< Сохранить заметку как....
+        PrintNotes     //!< Печать заметки.
     };
 }
 

diff --git a/Note/RichTextNote.cpp b/Note/RichTextNote.cpp
@@ -795,7 +795,7 @@ void RichTextNote::doubleClickingOnTitle()
     case Shared::DoNothing:
         break;
 
-    case Shared::EditTitle:
+    case Shared::EditTitleNote:
         selectTitle();
         break;
 
@@ -807,7 +807,11 @@ void RichTextNote::doubleClickingOnTitle()
         invokeRemove();
         break;
 
-    case Shared::SaveAs:
+    case Shared::SaveNote:
+        save();
+        break;
+
+    case Shared::SaveNoteAs:
         saveAs();
         break;