v1.2.0

soramimi · Jun 27, 2020 · 1001631 · 1001631
1 parent 2f6eaf3
commit 1001631
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 24 deletions.
diff --git a/src/EditRemoteDialog.ui b/src/EditRemoteDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>700</width>
-    <height>251</height>
+    <height>347</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -65,7 +65,7 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>78</height>
+       <height>106</height>
       </size>
      </property>
     </widget>

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -172,6 +172,8 @@ MainWindow::MainWindow(QWidget *parent)
 		}
 	}
 
+	ui->action_sidebar->setChecked(true);
+
 	startTimers();
 }
 
@@ -2932,10 +2934,10 @@ void MainWindow::on_action_sidebar_triggered()
 	bool f = ui->stackedWidget_leftpanel->isVisible();
 	f = !f;
 	ui->stackedWidget_leftpanel->setVisible(f);
+	ui->action_sidebar->setChecked(f);
 }
 
-
-
+#if 0
 void MainWindow::on_action_wide_triggered()
 {
 	QWidget *w = focusWidget();
@@ -2956,6 +2958,7 @@ void MainWindow::on_action_wide_triggered()
 		}
 	}
 }
+#endif
 
 void MainWindow::setShowLabels(bool show, bool save)
 {

diff --git a/src/MainWindow.h b/src/MainWindow.h
@@ -214,7 +214,7 @@ private slots:
 
 	void on_action_expand_diff_view_triggered();
 
-	void on_action_wide_triggered();
+//	void on_action_wide_triggered();
 
 	void on_action_sidebar_triggered();
 

diff --git a/src/MainWindow.ui b/src/MainWindow.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>854</width>
+    <width>863</width>
     <height>596</height>
    </rect>
   </property>
@@ -1014,8 +1014,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>854</width>
-     <height>25</height>
+     <width>863</width>
+     <height>35</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -1062,6 +1062,11 @@
      <string>&amp;Window</string>
     </property>
     <addaction name="action_window_log"/>
+    <addaction name="separator"/>
+    <addaction name="action_sidebar"/>
+    <addaction name="action_expand_commit_log"/>
+    <addaction name="action_expand_file_list"/>
+    <addaction name="action_expand_diff_view"/>
    </widget>
    <widget class="QMenu" name="menu_Repository">
     <property name="title">
@@ -1121,16 +1126,6 @@
     <addaction name="separator"/>
     <addaction name="action_clean_df"/>
    </widget>
-   <widget class="QMenu" name="menuExperimental">
-    <property name="title">
-     <string>Experimental</string>
-    </property>
-    <addaction name="action_expand_commit_log"/>
-    <addaction name="action_expand_file_list"/>
-    <addaction name="action_expand_diff_view"/>
-    <addaction name="action_sidebar"/>
-    <addaction name="action_wide"/>
-   </widget>
    <addaction name="menu_File"/>
    <addaction name="menu_View"/>
    <addaction name="menu_Edit"/>
@@ -1139,7 +1134,6 @@
    <addaction name="menuDestructive_3"/>
    <addaction name="menu_Window"/>
    <addaction name="menu_Help"/>
-   <addaction name="menuExperimental"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <widget class="QDockWidget" name="dockWidget_log">
@@ -1667,11 +1661,14 @@
    </property>
   </action>
   <action name="action_sidebar">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Sidebar</string>
    </property>
    <property name="shortcut">
-    <string>F1</string>
+    <string>Ctrl+1</string>
    </property>
   </action>
   <action name="action_wide">

diff --git a/version.rb b/version.rb
@@ -1,14 +1,27 @@
 #!/dev/null
 
 $product_name = "Guitar"
-$copyright_year = 2019
+$copyright_year = 2020
 $version_a = 1
-$version_b = 1
-$version_c = 999
+$version_b = 2
+$version_c = 0
 $version_d = 0
 
+# Future plans
+#
+# v1.3.0 xxxx-xx-xx
+# - submodule support
+# - word oriented diffs
+#
 
-# v1.1.1 2019-09-xx
+# History
+#
+# v1.2.0 2020-06-27
+# - SSHキーオーバーライド機能
+# - ウィンドウレイアウト（仮）
+# - 中国語（簡体字）
+#
+# v1.1.1 2019-09-02
 # - ダークテーマ描画修正
 # - 初回起動時のウェルカムダイアログボックスの改良
 # - 小さな修正