Merge branch 'master' of https://github.com/coder3101/cp-editor

cpeditor · Jan 13, 2020 · f6a5d0a · f6a5d0a
2 parents f1add1d + ca66c50
commit f6a5d0a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 27 deletions.
diff --git a/src/preferencewindow.cpp b/src/preferencewindow.cpp
@@ -38,7 +38,6 @@ PreferenceWindow::PreferenceWindow(Settings::SettingManager *manager, QWidget *p
     setWindowTitle("Preferences");
 
     editor = new QCodeEditor();
-    editor->setMinimumHeight(300);
     ui->verticalLayout_3->insertWidget(0, editor);
 
     connect(ui->snippets, SIGNAL(currentTextChanged(const QString &)), this,
@@ -287,7 +286,11 @@ void PreferenceWindow::on_load_snippets_from_file_clicked()
         }
         else
         {
-            auto snippetName = getNewSnippetName(lang, QFileInfo(file).baseName());
+            auto snippetName = QFileInfo(file).baseName();
+            if (snippetName.isEmpty())
+                snippetName = QFileInfo(file).fileName();
+            if (ui->snippets->findText(snippetName) != -1)
+                snippetName = getNewSnippetName(lang, snippetName);
             if (!snippetName.isEmpty())
             {
                 manager->setSnippet(lang, snippetName, file.readAll());
@@ -366,7 +369,6 @@ void PreferenceWindow::applySettingsToEditor()
         editor->setSyntaxStyle(Themes::EditorTheme::getLightTheme());
 }
 
-
 void PreferenceWindow::on_snippet_save_clicked()
 {
     auto lang = ui->snippets_lang->currentText();
@@ -431,13 +433,10 @@ void PreferenceWindow::on_snippet_rename_clicked()
     }
 }
 
-
 QString PreferenceWindow::getNewSnippetName(const QString &lang, const QString &old)
 {
-    if (ui->snippets->findText(old) != -1)
-        return old;
     QString label = "New name:";
-    if (!old.isNull())
+    if (!old.isEmpty())
         label = "The name " + old + " is used for " + lang + "\n" + label;
     auto name = QInputDialog::getText(this, tr("Snippet Name"), label);
     if (name.isEmpty())

diff --git a/ui/preferencewindow.ui b/ui/preferencewindow.ui
@@ -526,7 +526,7 @@ p, li { white-space: pre-wrap; }
                </font>
               </property>
               <property name="text">
-               <string>Language for snippet</string>
+               <string>Language for snippets</string>
               </property>
              </widget>
             </item>
@@ -549,7 +549,7 @@ p, li { white-space: pre-wrap; }
               </item>
              </widget>
             </item>
-            <item row="2" column="0">
+            <item row="1" column="0">
              <widget class="QLabel" name="label_45">
               <property name="font">
                <font>
@@ -563,14 +563,14 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
+            <item row="1" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_8">
               <item>
                <widget class="QComboBox" name="snippets"/>
               </item>
              </layout>
             </item>
-            <item row="3" column="0">
+            <item row="2" column="0">
              <widget class="QLabel" name="label_46">
               <property name="font">
                <font>
@@ -584,7 +584,7 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
-            <item row="3" column="1">
+            <item row="2" column="1">
              <layout class="QVBoxLayout" name="verticalLayout_3">
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_11">
@@ -593,53 +593,52 @@ p, li { white-space: pre-wrap; }
                   <property name="text">
                    <string>Save</string>
                   </property>
+                  <property name="shortcut">
+                   <string>Ctrl+S</string>
+                  </property>
                  </widget>
                 </item>
                 <item>
                  <widget class="QPushButton" name="snippet_new">
                   <property name="text">
                    <string>New</string>
                   </property>
+                  <property name="shortcut">
+                   <string>Ctrl+N</string>
+                  </property>
                  </widget>
                 </item>
                 <item>
                  <widget class="QPushButton" name="snippet_delete">
                   <property name="text">
                    <string>Delete</string>
                   </property>
+                  <property name="shortcut">
+                   <string>Ctrl+D</string>
+                  </property>
                  </widget>
                 </item>
                 <item>
                  <widget class="QPushButton" name="snippet_rename">
                   <property name="text">
                    <string>Rename</string>
                   </property>
+                  <property name="shortcut">
+                   <string>Ctrl+R</string>
+                  </property>
                  </widget>
                 </item>
                </layout>
               </item>
              </layout>
             </item>
-            <item row="4" column="1">
+            <item row="3" column="1">
              <widget class="QPushButton" name="load_snippets_from_file">
               <property name="text">
-               <string>Load Snippets From File</string>
+               <string>Load Snippets From Files</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <spacer name="verticalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>40</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
           </item>
          </layout>