From 1eb47308a6cfdad04e5f8fdf7b22de9dea678de9 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Sun, 24 Apr 2022 19:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4pad=E7=AB=AF=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=AF=B9=E9=BD=90=E6=96=B9=E5=BC=8F,=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE=E8=8B=B1=E6=96=87=E5=85=A8=E5=A4=A7?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en-US/index.ts |  3 +++
 src/pad/BottomBar.vue   |  3 +--
 src/pad/TopToolbar.vue  | 38 +++++++++++++++++++++++++-------------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 3981bb1..6c56f77 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -15,4 +15,7 @@ export default {
   "power on": "PowerOn",
   "power off": "PowerOff",
   "stop plan": "StopPlan",
+  "other setting": "Other",
+  close: "Close",
+  logout: "Logout",
 };
diff --git a/src/pad/BottomBar.vue b/src/pad/BottomBar.vue
index 8f3320c..e8ba83b 100644
--- a/src/pad/BottomBar.vue
+++ b/src/pad/BottomBar.vue
@@ -11,8 +11,7 @@
             v-model="tab"
             dense
             inline-label
-            class="text-white bg-accent"
-            :class="'col-' + ($store.state.landspace ? '8' : '12')"
+            class="col-12 text-white bg-accent"
             style="border: none"
             active-color="secondary"
             indicator-color="secondary"
diff --git a/src/pad/TopToolbar.vue b/src/pad/TopToolbar.vue
index 689c83a..84350f7 100644
--- a/src/pad/TopToolbar.vue
+++ b/src/pad/TopToolbar.vue
@@ -4,86 +4,95 @@
     style="flex-wrap: wrap"
   >
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/close_icon.png"
       :label="$t('close')"
       @click="closeCurrentWindow"
     />
 
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/clean_windows_icon.png"
       :label="$t('clean screen')"
       @click="closeAllWindows"
     />
 
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/full_screen_icon.png"
       :label="$t('full screen window')"
       @click="fullscreenWindow"
     />
 
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/exit_full_screen_icon.png"
       :label="$t('restore window size')"
       @click="exitFullscreenWindow"
     />
 
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/top_window_icon.png"
       :label="$t('win top')"
       @click="topWindow"
     />
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/lower_window_icon.png"
       :label="$t('win lower')"
       @click="lowerWindow"
     />
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/center_control_icon.png"
       :label="$t('center control')"
       @click="$refs.center_control_dialog.showDialog()"
     />
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/power_on_icon.png"
       :label="$t('power on')"
       @click="powerOn"
     />
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/power_off_icon.png"
       :label="$t('power off')"
       @click="powerOff"
@@ -92,20 +101,21 @@
       stretch
       flat
       stack
+      no-caps
       icon="img:pad/toolbar/stop_plan.png"
       :label="$t('stop plan')"
-      class="col-1"
+      class="col-auto"
       v-if="plan_running"
       @click="stopPlan"
     />
-    <q-space />
     <q-btn
-      class="col-1"
+      class="col-auto"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/other_setting.png"
-      :label="$t('other')"
+      :label="$t('other setting')"
     >
       <q-popup-proxy>
         <q-list class="shadow-2 text-primary">
@@ -144,11 +154,13 @@
         </q-list>
       </q-popup-proxy>
     </q-btn>
+    <q-space />
     <q-btn
       class="col-1"
       stretch
       stack
       flat
+      no-caps
       icon="img:pad/toolbar/logout_icon.png"
       :label="$t('logout')"
       @click="logout"