From 7e7c6aad856812165e891ef26a994a9378a11d20 Mon Sep 17 00:00:00 2001
From: Hugo Teso <hugo.teso@gmail.com>
Date: Wed, 12 Apr 2017 14:07:43 +0200
Subject: [PATCH] Removed some scrollbars. Small fix in disasm navigation

---
 src/optionsdialog.cpp        | 12 ++++++------
 src/optionsdialog.ui         |  5 +++--
 src/widgets/memorywidget.cpp |  1 +
 src/widgets/memorywidget.ui  |  6 +++---
 src/widgets/notepad.ui       |  6 ++++++
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
index 694bf703..c441aa9d 100644
--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
@@ -277,15 +277,15 @@ QString OptionsDialog::analysisDescription(int level)
     switch(level)
     {
     case 0:
-        return tr("Analysis disabled");
+        return tr("Disabled");
     case 1:
-        return tr("Minimum analysis");
+        return tr("Minimum");
     case 2:
-        return tr("Basic analysis");
+        return tr("Basic");
     case 3:
-        return tr("Medium analysis");
+        return tr("Medium");
     case 4:
-        return tr("Full analysis <font color='red'><b>(Experimental)</b></font>");
+        return tr("Full <font color='red'><b>(Experimental)</b></font>");
     default:
         return tr("Unknown");
     }
@@ -293,7 +293,7 @@ QString OptionsDialog::analysisDescription(int level)
 
 void OptionsDialog::on_analSlider_valueChanged(int value)
 {
-    ui->analDescription->setText(tr("Level") + QString(" - %1").arg(analysisDescription(value)));
+    ui->analDescription->setText(tr("Analysis level") + QString(" - %1").arg(analysisDescription(value)));
     if (value == 0)
     {
         ui->analCheckBox->setChecked(false);
diff --git a/src/optionsdialog.ui b/src/optionsdialog.ui
index 3928c3e4..218dec3e 100644
--- a/src/optionsdialog.ui
+++ b/src/optionsdialog.ui
@@ -202,7 +202,7 @@
                </font>
               </property>
               <property name="text">
-               <string>Level</string>
+               <string>Analysis level</string>
               </property>
              </widget>
             </item>
@@ -279,7 +279,8 @@
                </sizepolicy>
               </property>
               <property name="styleSheet">
-               <string notr="true">background-color: rgb(255, 255, 255);</string>
+               <string notr="true">background-color: rgb(255, 255, 255);
+color: rgb(0, 0, 0);</string>
               </property>
               <property name="frameShape">
                <enum>QFrame::NoFrame</enum>
diff --git a/src/widgets/memorywidget.cpp b/src/widgets/memorywidget.cpp
index 7ce521e4..1af3f946 100644
--- a/src/widgets/memorywidget.cpp
+++ b/src/widgets/memorywidget.cpp
@@ -527,6 +527,7 @@ void MemoryWidget::refreshDisasm(const QString &offset)
 
     connect(this->disasTextEdit->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(disasmScrolled()));
     connect(this->disasTextEdit, SIGNAL(cursorPositionChanged()), this, SLOT(on_disasTextEdit_2_cursorPositionChanged()));
+    this->on_disasTextEdit_2_cursorPositionChanged();
 }
 
 void MemoryWidget::refreshHexdump(QString where)
diff --git a/src/widgets/memorywidget.ui b/src/widgets/memorywidget.ui
index 5c1d8bfa..03713d18 100644
--- a/src/widgets/memorywidget.ui
+++ b/src/widgets/memorywidget.ui
@@ -523,6 +523,9 @@ border-top: 0px;
            <property name="verticalScrollBarPolicy">
             <enum>Qt::ScrollBarAlwaysOff</enum>
            </property>
+           <property name="horizontalScrollBarPolicy">
+            <enum>Qt::ScrollBarAlwaysOff</enum>
+           </property>
            <property name="undoRedoEnabled">
             <bool>true</bool>
            </property>
@@ -772,9 +775,6 @@ QToolTip {
                 </spacer>
                </item>
               </layout>
-              <zorder>previewToolButton</zorder>
-              <zorder>decoToolButton</zorder>
-              <zorder>simpleGrapgToolButton</zorder>
              </widget>
             </item>
             <item>
diff --git a/src/widgets/notepad.ui b/src/widgets/notepad.ui
index c0fa07c2..e7f2b041 100644
--- a/src/widgets/notepad.ui
+++ b/src/widgets/notepad.ui
@@ -679,6 +679,9 @@ QToolTip {
            <property name="frameShadow">
             <enum>QFrame::Plain</enum>
            </property>
+           <property name="horizontalScrollBarPolicy">
+            <enum>Qt::ScrollBarAlwaysOff</enum>
+           </property>
            <property name="lineWrapMode">
             <enum>QPlainTextEdit::NoWrap</enum>
            </property>
@@ -708,6 +711,9 @@ QToolTip {
            <property name="frameShadow">
             <enum>QFrame::Plain</enum>
            </property>
+           <property name="horizontalScrollBarPolicy">
+            <enum>Qt::ScrollBarAlwaysOff</enum>
+           </property>
            <property name="lineWrapMode">
             <enum>QPlainTextEdit::NoWrap</enum>
            </property>