Skip to content

Commit

Permalink
Optimize UI.
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackINT3 committed Oct 31, 2020
1 parent d755d50 commit 61f3faa
Show file tree
Hide file tree
Showing 12 changed files with 258 additions and 230 deletions.
6 changes: 6 additions & 0 deletions src/OpenArk/kernel/kernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,12 @@ void Kernel::InitKernelEntryView()
AddSummaryUpItem(tr("SystemRoot"), WStrToQ(UNONE::OsWinDirW()));

connect(ui.kernelModeBtn, SIGNAL(clicked()), this, SLOT(onClickKernelMode()));
connect(ui.kernelInfoView, &QTableView::doubleClicked, [&](QModelIndex idx) {
QString &txt = idx.data().toString();
if (txt == tr("ReleaseNumber") || txt == tr("BuildNumber")) {
ShellOpenUrl("https://docs.microsoft.com/en-us/windows/release-information/");
}
});

arkdrv_conn_ = false;
auto timer = new QTimer(this);
Expand Down
274 changes: 138 additions & 136 deletions src/OpenArk/openark_zh.ts

Large diffs are not rendered by default.

Binary file modified src/OpenArk/res/lang/openark_zh.qm
Binary file not shown.
14 changes: 13 additions & 1 deletion src/OpenArk/res/ui/memory-rw.ui
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,23 @@
<height>0</height>
</size>
</property>
<property name="font">
<font>
<family>SimSun</family>
<kerning>false</kerning>
</font>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
</widget>
<widget class="QTextEdit" name="disasmEdit">
<property name="font">
<font>
<family>SimSun</family>
<kerning>false</kerning>
</font>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
Expand Down Expand Up @@ -325,7 +337,7 @@
<item>
<widget class="QLabel" name="statusLabel">
<property name="text">
<string> </string>
<string/>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/OpenArk/ui/about.ui
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ font-size:14px;</string>
<x>40</x>
<y>190</y>
<width>451</width>
<height>41</height>
<height>51</height>
</rect>
</property>
<property name="text">
Expand Down
16 changes: 8 additions & 8 deletions src/OpenArk/ui/bundler.ui
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,14 @@
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;;&lt;span style=&quot; font-weight:600; color:#00aa00;&quot;&gt;Bundler script manual&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;;&lt;span style=&quot; font-weight:600; color:#aa0000;&quot;&gt;start&lt;/span&gt; file param - aysnc execute file&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;;&lt;span style=&quot; font-weight:600; color:#aa0000;&quot;&gt;call&lt;/span&gt; file param - sync execute file until exited&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;;&lt;span style=&quot; font-weight:600; color:#aa0000;&quot;&gt;cmd&lt;/span&gt; param - execute cmd&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;;&lt;span style=&quot; font-weight:600; color:#aa0000;&quot;&gt;clean&lt;/span&gt; - remove extracted files&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;;--------------------------------------------------------------------------------------&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;call %root%\OpenArk32.exe&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;clean&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt;;&lt;/span&gt;&lt;span style=&quot; font-family:'Microsoft YaHei'; font-weight:600; color:#00aa00;&quot;&gt;Bundler script manual&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt;;&lt;/span&gt;&lt;span style=&quot; font-family:'Microsoft YaHei'; font-weight:600; color:#aa0000;&quot;&gt;start&lt;/span&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt; file param - aysnc execute file&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt;;&lt;/span&gt;&lt;span style=&quot; font-family:'Microsoft YaHei'; font-weight:600; color:#aa0000;&quot;&gt;call&lt;/span&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt; file param - sync execute file until exited&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt;;&lt;/span&gt;&lt;span style=&quot; font-family:'Microsoft YaHei'; font-weight:600; color:#aa0000;&quot;&gt;cmd&lt;/span&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt; param - execute cmd&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt;;&lt;/span&gt;&lt;span style=&quot; font-family:'Microsoft YaHei'; font-weight:600; color:#aa0000;&quot;&gt;clean&lt;/span&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt; - remove extracted files&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt;;--------------------------------------------------------------------------------------&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt;call %root%\OpenArk32.exe&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei';&quot;&gt;clean&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/OpenArk/ui/kernel.ui
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@
</widget>
<widget class="QWidget" name="tabNotify">
<attribute name="title">
<string>SystemNotify</string>
<string>System Notify</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="leftMargin">
Expand Down
4 changes: 2 additions & 2 deletions src/OpenArk/ui/openark.ui
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; color:#21daff;&quot;&gt;OpenArk Console&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#e0e2e4;&quot;&gt;Copyright (C) 2019 BlackINT3 &lt;/span&gt;&lt;a href=&quot;https://github.com/BlackINT3/OpenArk&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#8ccf34;&quot;&gt;https://github.com/BlackINT3/OpenArk&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei'; font-weight:600; color:#21daff;&quot;&gt;OpenArk Console&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei'; color:#e0e2e4;&quot;&gt;Copyright (C) 2019 BlackINT3 &lt;/span&gt;&lt;a href=&quot;https://github.com/BlackINT3/OpenArk&quot;&gt;&lt;span style=&quot; font-family:'Microsoft YaHei'; text-decoration: underline; color:#8ccf34;&quot;&gt;https://github.com/BlackINT3/OpenArk&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
Expand Down
2 changes: 1 addition & 1 deletion src/OpenArk/ui/process-mgr.ui
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="indentation">
<number>20</number>
<number>5</number>
</property>
<property name="itemsExpandable">
<bool>true</bool>
Expand Down
16 changes: 12 additions & 4 deletions src/OpenArk/ui/process-properties.ui
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="imageTab">
<property name="sizePolicy">
Expand Down Expand Up @@ -398,7 +398,7 @@
<x>310</x>
<y>420</y>
<width>41</width>
<height>21</height>
<height>16</height>
</rect>
</property>
<property name="cursor">
Expand All @@ -418,7 +418,11 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTreeView" name="threadView"/>
<widget class="QTreeView" name="threadView">
<property name="indentation">
<number>5</number>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
Expand Down Expand Up @@ -459,7 +463,11 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QTreeView" name="wndsView"/>
<widget class="QTreeView" name="wndsView">
<property name="indentation">
<number>5</number>
</property>
</widget>
</item>
</layout>
</widget>
Expand Down
Loading

0 comments on commit 61f3faa

Please sign in to comment.