Merge pull request #573 from ONLYOFFICE/patch/develop_r1

Patch/develop

win-linux/res/styles/tabbar@1.25x.qss

@@ -19,6 +19,31 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;}
 #mainPanel[uitheme=theme-dark] QTabBar::tab:selected {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] QTabBar[active=false]::tab:selected:hover {background-color: #555;}
 
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #606060;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;}
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;}
+
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton {
+    image: url(:/tabbar/icons/scrolltab_ln_light_1.25x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_ld_light_1.25x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover {
+    image: url(:/tabbar/icons/scrolltab_lh_light_1.25x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_lp_light_1.25x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton {
+    image: url(:/tabbar/icons/scrolltab_rn_light_1.25x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_rd_light_1.25x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover {
+    image: url(:/tabbar/icons/scrolltab_rh_light_1.25x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_rp_light_1.25x.png) center no-repeat;
+}

win-linux/res/styles/tabbar@1.5x.qss

@@ -19,6 +19,31 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;}
 #mainPanel[uitheme=theme-dark] QTabBar::tab:selected {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] QTabBar[active=false]::tab:selected:hover {background-color: #555;}
 
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #606060;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;}
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;}
+
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton {
+    image: url(:/tabbar/icons/scrolltab_ln_light_1.5x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_ld_light_1.5x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover {
+    image: url(:/tabbar/icons/scrolltab_lh_light_1.5x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_lp_light_1.5x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton {
+    image: url(:/tabbar/icons/scrolltab_rn_light_1.5x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_rd_light_1.5x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover {
+    image: url(:/tabbar/icons/scrolltab_rh_light_1.5x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_rp_light_1.5x.png) center no-repeat;
+}

win-linux/res/styles/tabbar@1.75x.qss

@@ -19,6 +19,31 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;}
 #mainPanel[uitheme=theme-dark] QTabBar::tab:selected {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] QTabBar[active=false]::tab:selected:hover {background-color: #555;}
 
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #606060;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;}
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;}
+
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton {
+    image: url(:/tabbar/icons/scrolltab_ln_light_1.75x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_ld_light_1.75x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover {
+    image: url(:/tabbar/icons/scrolltab_lh_light_1.75x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_lp_light_1.75x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton {
+    image: url(:/tabbar/icons/scrolltab_rn_light_1.75x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_rd_light_1.75x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover {
+    image: url(:/tabbar/icons/scrolltab_rh_light_1.75x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_rp_light_1.75x.png) center no-repeat;
+}

win-linux/res/styles/tabbar@1x.qss

@@ -19,6 +19,31 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;}
 #mainPanel[uitheme=theme-dark] QTabBar::tab:selected {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] QTabBar[active=false]::tab:selected:hover {background-color: #555;}
 
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #606060;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;}
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;}
+
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton {
+    image: url(:/tabbar/icons/scrolltab_ln_light.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_ld_light.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover {
+    image: url(:/tabbar/icons/scrolltab_lh_light.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_lp_light.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton {
+    image: url(:/tabbar/icons/scrolltab_rn_light.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_rd_light.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover {
+    image: url(:/tabbar/icons/scrolltab_rh_light.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_rp_light.png) center no-repeat;
+}

win-linux/res/styles/tabbar@2x.qss

@@ -19,6 +19,31 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;}
 #mainPanel[uitheme=theme-dark] QTabBar::tab:selected {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] QTabBar[active=false]::tab:selected:hover {background-color: #555;}
 
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #606060;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;}
 #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;}
-#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;}
+
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton {
+    image: url(:/tabbar/icons/scrolltab_ln_light_2x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_ld_light_2x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover {
+    image: url(:/tabbar/icons/scrolltab_lh_light_2x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_lp_light_2x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton {
+    image: url(:/tabbar/icons/scrolltab_rn_light_2x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled {
+    image: url(:/tabbar/icons/scrolltab_rd_light_2x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover {
+    image: url(:/tabbar/icons/scrolltab_rh_light_2x.png) center no-repeat;
+}
+#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed {
+    image: url(:/tabbar/icons/scrolltab_rp_light_2x.png) center no-repeat;
+}

win-linux/resources.qrc

@@ -100,6 +100,46 @@
         <file alias="scrolltab_rn_1.5x.png">res/icons/tabbar/changetab_right_normal@1.5x.png</file>
         <file alias="scrolltab_rn_1.75x.png">res/icons/tabbar/changetab_right_normal@1.75x.png</file>
         <file alias="scrolltab_rn_2x.png">res/icons/tabbar/changetab_right_normal@2x.png</file>
+        <file alias="scrolltab_lp_light.png">res/icons/tabbar/changetab_left_active_light.png</file>
+        <file alias="scrolltab_lp_light_1.5x.png">res/icons/tabbar/changetab_left_active_light@1.5x.png</file>
+        <file alias="scrolltab_lp_light_1.25x.png">res/icons/tabbar/changetab_left_active_light@1.25x.png</file>
+        <file alias="scrolltab_lp_light_1.75x.png">res/icons/tabbar/changetab_left_active_light@1.75x.png</file>
+        <file alias="scrolltab_lp_light_2x.png">res/icons/tabbar/changetab_left_active_light@2x.png</file>
+        <file alias="scrolltab_ld_light.png">res/icons/tabbar/changetab_left_disabled_light.png</file>
+        <file alias="scrolltab_ld_light_1.5x.png">res/icons/tabbar/changetab_left_disabled_light@1.5x.png</file>
+        <file alias="scrolltab_ld_light_1.25x.png">res/icons/tabbar/changetab_left_disabled_light@1.25x.png</file>
+        <file alias="scrolltab_ld_light_1.75x.png">res/icons/tabbar/changetab_left_disabled_light@1.75x.png</file>
+        <file alias="scrolltab_ld_light_2x.png">res/icons/tabbar/changetab_left_disabled_light@2x.png</file>
+        <file alias="scrolltab_lh_light.png">res/icons/tabbar/changetab_left_hover_light.png</file>
+        <file alias="scrolltab_lh_light_1.5x.png">res/icons/tabbar/changetab_left_hover_light@1.5x.png</file>
+        <file alias="scrolltab_lh_light_1.25x.png">res/icons/tabbar/changetab_left_hover_light@1.25x.png</file>
+        <file alias="scrolltab_lh_light_1.75x.png">res/icons/tabbar/changetab_left_hover_light@1.75x.png</file>
+        <file alias="scrolltab_lh_light_2x.png">res/icons/tabbar/changetab_left_hover_light@2x.png</file>
+        <file alias="scrolltab_ln_light.png">res/icons/tabbar/changetab_left_normal_light.png</file>
+        <file alias="scrolltab_ln_light_1.5x.png">res/icons/tabbar/changetab_left_normal_light@1.5x.png</file>
+        <file alias="scrolltab_ln_light_1.25x.png">res/icons/tabbar/changetab_left_normal_light@1.25x.png</file>
+        <file alias="scrolltab_ln_light_1.75x.png">res/icons/tabbar/changetab_left_normal_light@1.75x.png</file>
+        <file alias="scrolltab_ln_light_2x.png">res/icons/tabbar/changetab_left_normal_light@2x.png</file>
+        <file alias="scrolltab_rp_light.png">res/icons/tabbar/changetab_right_active_light.png</file>
+        <file alias="scrolltab_rp_light_1.5x.png">res/icons/tabbar/changetab_right_active_light@1.5x.png</file>
+        <file alias="scrolltab_rp_light_1.25x.png">res/icons/tabbar/changetab_right_active_light@1.25x.png</file>
+        <file alias="scrolltab_rp_light_1.75x.png">res/icons/tabbar/changetab_right_active_light@1.75x.png</file>
+        <file alias="scrolltab_rp_light_2x.png">res/icons/tabbar/changetab_right_active_light@2x.png</file>
+        <file alias="scrolltab_rd_light.png">res/icons/tabbar/changetab_right_disabled_light.png</file>
+        <file alias="scrolltab_rd_light_1.5x.png">res/icons/tabbar/changetab_right_disabled_light@1.5x.png</file>
+        <file alias="scrolltab_rd_light_1.25x.png">res/icons/tabbar/changetab_right_disabled_light@1.25x.png</file>
+        <file alias="scrolltab_rd_light_1.75x.png">res/icons/tabbar/changetab_right_disabled_light@1.75x.png</file>
+        <file alias="scrolltab_rd_light_2x.png">res/icons/tabbar/changetab_right_disabled_light@2x.png</file>
+        <file alias="scrolltab_rh_light.png">res/icons/tabbar/changetab_right_hover_light.png</file>
+        <file alias="scrolltab_rh_light_1.5x.png">res/icons/tabbar/changetab_right_hover_light@1.5x.png</file>
+        <file alias="scrolltab_rh_light_1.25x.png">res/icons/tabbar/changetab_right_hover_light@1.25x.png</file>
+        <file alias="scrolltab_rh_light_1.75x.png">res/icons/tabbar/changetab_right_hover_light@1.75x.png</file>
+        <file alias="scrolltab_rh_light_2x.png">res/icons/tabbar/changetab_right_hover_light@2x.png</file>
+        <file alias="scrolltab_rn_light.png">res/icons/tabbar/changetab_right_normal_light.png</file>
+        <file alias="scrolltab_rn_light_1.5x.png">res/icons/tabbar/changetab_right_normal_light@1.5x.png</file>
+        <file alias="scrolltab_rn_light_1.25x.png">res/icons/tabbar/changetab_right_normal_light@1.25x.png</file>
+        <file alias="scrolltab_rn_light_1.75x.png">res/icons/tabbar/changetab_right_normal_light@1.75x.png</file>
+        <file alias="scrolltab_rn_light_2x.png">res/icons/tabbar/changetab_right_normal_light@2x.png</file>
         <file alias="de.png">res/icons/tabbar/tabicon_de_normal.png</file>
         <file alias="de@1.25x.png">res/icons/tabbar/tabicon_de_normal_1.25x.png</file>
         <file alias="de@1.5x.png">res/icons/tabbar/tabicon_de_normal_1.5x.png</file>

win-linux/src/components/asctabwidget.cpp

@@ -702,7 +702,7 @@ int CAscTabWidget::openLocalDocument(const COpenOptions& options, bool select, b
     }
 
     if (select && !(tabIndex < 0))
-        m_pBar->setCurrentIndex(tabIndex);
+        setCurrentIndex(tabIndex);
 
     /* TODO: rise message if index < 0 */