added QScrollArea on Settings::General,About::ThanksTo

P0cL4bs · Jul 12, 2016 · 3b0398d · 3b0398d
1 parent 7e8f65f
commit 3b0398d
Show file tree

Hide file tree

Showing 6 changed files with 200 additions and 126 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -22,6 +22,7 @@ Version 0.7.5
 - fixed error on "Settings" option #58
 - added Qprocess into Threads::Process,fixed run plugin::dns2proxy
 - fixed error Advanced Mode::monitor crashed application #60
+- added QScrollArea on Settings::General, About::ThanksTo
 
 Version 0.7.3
 -------------

diff --git a/Core/Main.py b/Core/Main.py
@@ -377,7 +377,7 @@ def intGUI(self):
         btn_mac = QAction('Mac Changer', self)
         btn_dhcpStar = QAction('DHCP S. Attack',self)
         btn_winup = QAction('Windows Update',self)
-        btn_arp = QAction('Arp Posion Attack',self)
+        btn_arp = QAction('Arp Poison Attack',self)
         btn_dns = QAction('Dns Spoof Attack',self)
         btn_phishing = QAction('Phishing Manager',self)
         action_settings = QAction('Settings',self)

diff --git a/Core/config/commits/Lcommits.cfg b/Core/config/commits/Lcommits.cfg
@@ -17,4 +17,5 @@ master:
   { changelog : 'fixed error on "Settings" option #58' },
   { changelog : 'added Qprocess into Threads::Process,fixed run plugin::dns2proxy' },
   { changelog : 'fixed error Advanced Mode::monitor crashed application #60' },
+  { changelog : 'added QScrollArea on Settings::General, About::ThanksTo' },
 ]
diff --git a/Core/helpers/about.py b/Core/helpers/about.py
@@ -23,14 +23,35 @@ def __init__(self,parent = None):
         self.setText(open('CHANGELOG','r').read())
         self.setReadOnly(True)
 
-class TranksTo(QTextEdit):
-    def __init__(self,formLayout,parent = None):
-        super(TranksTo,self).__init__(parent)
-        self.setReadOnly(True)
-        self.setStyleSheet('''QWidget {
-        color: #b1b1b1; background-color: #323232;}''')
-        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
-        self.setLayout(formLayout)
+
+class SettingsTranks(QVBoxLayout):
+    def __init__(self,parent = None):
+        super(SettingsTranks, self).__init__(parent)
+        self.mainLayout    = QFormLayout()
+        self.scrollwidget = QWidget()
+        self.scrollwidget.setLayout(self.mainLayout)
+        self.scroll = QScrollArea()
+        self.scroll.setWidgetResizable(True)
+        self.scroll.setWidget(self.scrollwidget)
+
+        self.formMode = QFormLayout()
+        self.formMode.addRow(QLabel('<a href="https://github.com/xtr4nge"><strong>@xtr4nge</strong></a>'))
+        self.formMode.addRow(QLabel('Sslstrip2 based version fork<br><br>'))
+        self.formMode.addRow(QLabel('<a href="https://github.com/LeonardoNve"><strong>@LeonardoNve</strong></a>'))
+        self.formMode.addRow(QLabel('Plugin SSLstrip version fork,Plugin dns2proxy<br><br>'))
+        self.formMode.addRow(QLabel('<a href="https://github.com/supernothing"><strong>Ben Schmidt @supernothing</strong></a>'))
+        self.formMode.addRow(QLabel('Plugin Sergio Proxy - bypass HSTS<br><br>'))
+        self.formMode.addRow(QLabel('<a href="https://github.com/DanMcInerney"><strong>Dan McInerney @danhmcinerney</strong></a>'))
+        self.formMode.addRow(QLabel('Plugin Netcreds - Sniffs sensitive data<br><br>'))
+        self.formMode.addRow(QLabel('<a href="http://www.yasinuludag.com/darkorange.stylesheet"><strong>Yasin Uludag</strong></a>'))
+        self.formMode.addRow(QLabel('theme1.qss - Qt dark orange stylesheet<br><br>'))
+        self.formMode.addRow(QLabel('<a href="https://github.com/ColinDuquesnoy/QDarkStyleSheet"><strong>Colin Duquesnoy @ColinDuquesnoy</strong></a>'))
+        self.formMode.addRow(QLabel('theme2.qss - Qt dark blue stylesheet<br><br>'))
+        self.mainLayout.addRow(self.formMode)
+
+        self.layout = QHBoxLayout()
+        self.layout.addWidget(self.scroll)
+        self.addLayout(self.layout)
 
 class frmAbout(PumpkinModule):
     def __init__(self,author,emails,version,
@@ -65,7 +86,7 @@ def Qui_update(self):
         self.tabwid = QTabWidget(self)
         self.TabAbout = QWidget(self)
         self.TabVersion = QWidget(self)
-        self.TabTranks  = QWidget(self)
+        self.TabTranks  = QWidget()
         self.TabChangelog = QWidget(self)
         self.btn_exit = QPushButton("Close")
         self.btn_exit.setFixedWidth(90)
@@ -104,17 +125,9 @@ def Qui_update(self):
         self.TabVersion.setLayout(self.formVersion)
 
         # Tranks Section
-        self.formMode = QFormLayout(self)
-        self.formMode.addRow(QLabel('<a href="https://github.com/xtr4nge"><strong>@xtr4nge</strong></a>'))
-        self.formMode.addRow(QLabel('Sslstrip2 based version fork<br><br>'))
-        self.formMode.addRow(QLabel('<a href="https://github.com/LeonardoNve"><strong>@LeonardoNve</strong></a>'))
-        self.formMode.addRow(QLabel('Plugin SSLstrip version fork,Plugin dns2proxy<br><br>'))
-        self.formMode.addRow(QLabel('<a href="https://github.com/supernothing"><strong>Ben Schmidt @supernothing</strong></a>'))
-        self.formMode.addRow(QLabel('Plugin Sergio Proxy - bypass HSTS<br><br>'))
-        self.formMode.addRow(QLabel('<a href="https://github.com/DanMcInerney"><strong>Dan McInerney @danhmcinerney</strong></a>'))
-        self.formMode.addRow(QLabel('Plugin Netcreds - Sniffs sensitive data<br><br>'))
-        self.formTranks.addRow(TranksTo(self.formMode))
-        self.TabTranks.setLayout(self.formTranks)
+        self.TabpageTranks = QVBoxLayout(self.TabTranks)
+        self.formTE = SettingsTranks()
+        self.TabpageTranks.addLayout(self.formTE)
 
         # Changelog Section
         self.formChange.addRow(ChangeLog())

diff --git a/Core/themes/theme1.qss b/Core/themes/theme1.qss
@@ -1,3 +1,8 @@
+/*
+by: Yasin Uludag. All rights reserved.
+download: http://www.yasinuludag.com/darkorange.stylesheet
+*/
+
 QToolTip
 {
      border: 1px solid black;