x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 2 Activity

GUI: Font tab in AppearanceDialog

This commit is contained in:
Mr. eXoDia 2014-07-21 00:19:33 +02:00
parent 67513f78f9
commit fa7c198c2b
9 changed files with 473 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x64_dbg_gui/Project/Src/BasicView/AbstractTableView.cpp
View File

@ -12,13 +12,10 @@ AbstractTableView::AbstractTableView(QWidget *parent) : QAbstractScrollArea(pare
data.activeButtonIndex=-1; data.activeButtonIndex=-1;
mHeader = data; mHeader = data;
QFont font("Monospace", 8); QFont font("Lucida Console", 8, QFont::Normal, false);
//QFont font("Terminal", 7);
//font.setBold(true); //bold
font.setFixedPitch(true); font.setFixedPitch(true);
font.setStyleHint(QFont::Monospace); font.setStyleHint(QFont::Monospace);
this->setFont(font); setFont(font);
backgroundColor=ConfigColor("AbstractTableViewBackgroundColor"); backgroundColor=ConfigColor("AbstractTableViewBackgroundColor");
textColor=ConfigColor("AbstractTableViewTextColor"); textColor=ConfigColor("AbstractTableViewTextColor");

2
x64_dbg_gui/Project/Src/Gui/AppearanceDialog.cpp
View File

@ -407,7 +407,7 @@ void AppearanceDialog::colorInfoListInit()
colorInfoIndex=0; colorInfoIndex=0;
colorInfoList.clear(); colorInfoList.clear();
//list entries //list entries
colorInfoListAppend("General:", "", ""); colorInfoListAppend("General Tables:", "", "");
colorInfoListAppend("Text", "AbstractTableViewTextColor", ""); colorInfoListAppend("Text", "AbstractTableViewTextColor", "");
colorInfoListAppend("Header Text", "AbstractTableViewHeaderTextColor", ""); colorInfoListAppend("Header Text", "AbstractTableViewHeaderTextColor", "");
colorInfoListAppend("Background", "AbstractTableViewBackgroundColor", ""); colorInfoListAppend("Background", "AbstractTableViewBackgroundColor", "");

449
x64_dbg_gui/Project/Src/Gui/AppearanceDialog.ui
View File

@ -29,6 +29,9 @@
<height>361</height> <height>361</height>
</rect> </rect>
</property> </property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tabColors"> <widget class="QWidget" name="tabColors">
<attribute name="title"> <attribute name="title">
<string>Colors</string> <string>Colors</string>
@ -552,6 +555,452 @@
<zorder>groupColor</zorder> <zorder>groupColor</zorder>
<zorder>groupProperties</zorder> <zorder>groupProperties</zorder>
</widget> </widget>
<widget class="QWidget" name="tabFont">
<attribute name="title">
<string>Font</string>
</attribute>
<widget class="QLabel" name="labelFontAbstractTables">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>110</width>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>General Tables:</string>
</property>
</widget>
<widget class="QLabel" name="labelFontDisassembly">
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<width>110</width>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Disassembly:</string>
</property>
</widget>
<widget class="QLabel" name="labelFontHexDump">
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<width>110</width>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>HexDump:</string>
</property>
</widget>
<widget class="QLabel" name="labelFontStack">
<property name="geometry">
<rect>
<x>10</x>
<y>100</y>
<width>110</width>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Stack:</string>
</property>
</widget>
<widget class="QLabel" name="labelFontRegisters">
<property name="geometry">
<rect>
<x>10</x>
<y>130</y>
<width>110</width>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Registers:</string>
</property>
</widget>
<widget class="QLabel" name="labelFontHexEdit">
<property name="geometry">
<rect>
<x>10</x>
<y>160</y>
<width>110</width>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>HexEdit:</string>
</property>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>190</y>
<width>501</width>
<height>25</height>
</rect>
</property>
<layout class="QHBoxLayout" name="fontApplicationLayout">
<item>
<widget class="QPushButton" name="buttpnApplicationFont">
<property name="text">
<string>&amp;Application Font</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelApplicationFont">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Courier New</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>130</x>
<y>11</y>
<width>381</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="fontAbstractTablesLayout">
<item>
<widget class="QFontComboBox" name="fontAbstractTables">
<property name="fontFilters">
<set>QFontComboBox::MonospacedFonts</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontAbstractTablesStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Bold + Italic</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontAbstractTablesSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContentsOnFirstShow</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>130</x>
<y>130</y>
<width>381</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="fontRegistersLayout">
<item>
<widget class="QFontComboBox" name="fontRegisters">
<property name="fontFilters">
<set>QFontComboBox::MonospacedFonts</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontRegistersStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Bold + Italic</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontRegistersSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContentsOnFirstShow</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>130</x>
<y>70</y>
<width>381</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="fontHexDumpLayout">
<item>
<widget class="QFontComboBox" name="fontHexDump">
<property name="fontFilters">
<set>QFontComboBox::MonospacedFonts</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontHexDumpStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Bold + Italic</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontHexDumpSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContentsOnFirstShow</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>130</x>
<y>40</y>
<width>381</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="fontDisassemblyLayout">
<item>
<widget class="QFontComboBox" name="fontDisassembly">
<property name="fontFilters">
<set>QFontComboBox::MonospacedFonts</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontDisassemblyStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Bold + Italic</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontDisassemblySize">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContentsOnFirstShow</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>130</x>
<y>100</y>
<width>381</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="fontStackLayout">
<item>
<widget class="QFontComboBox" name="fontStack">
<property name="fontFilters">
<set>QFontComboBox::MonospacedFonts</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontStackStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Bold + Italic</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontStackSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContentsOnFirstShow</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>130</x>
<y>160</y>
<width>381</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" name="fontHexEditLayout">
<item>
<widget class="QFontComboBox" name="fontHexEdit">
<property name="fontFilters">
<set>QFontComboBox::MonospacedFonts</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontHexEditStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Bold + Italic</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QComboBox" name="fontHexEditSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContentsOnFirstShow</enum>
</property>
</widget>
</item>
</layout>
</widget>
<zorder>layoutWidget</zorder>
<zorder>layoutWidget</zorder>
<zorder>layoutWidget</zorder>
<zorder>layoutWidget</zorder>
<zorder>layoutWidget</zorder>
<zorder>layoutWidget</zorder>
<zorder>layoutWidget</zorder>
<zorder>labelFontAbstractTables</zorder>
<zorder>labelFontDisassembly</zorder>
<zorder>labelFontHexDump</zorder>
<zorder>labelFontStack</zorder>
<zorder>labelFontRegisters</zorder>
<zorder>labelFontHexEdit</zorder>
</widget>
</widget> </widget>
<widget class="QPushButton" name="buttonCancel"> <widget class="QPushButton" name="buttonCancel">
<property name="geometry"> <property name="geometry">

2
x64_dbg_gui/Project/Src/Gui/CommandHelpView.cpp
View File

@ -18,7 +18,7 @@ CommandHelpView::CommandHelpView(QWidget *parent) :
mSearchListView->mSearchStartCol = 1; mSearchListView->mSearchStartCol = 1;
// Get font information // Get font information
QFont wFont("Monospace", 8); QFont wFont("Monospace", 8, QFont::Normal, false);
wFont.setStyleHint(QFont::Monospace); wFont.setStyleHint(QFont::Monospace);
wFont.setFixedPitch(true); wFont.setFixedPitch(true);
//int charwidth=QFontMetrics(wFont).width(QChar(' ')); //int charwidth=QFontMetrics(wFont).width(QChar(' '));

2
x64_dbg_gui/Project/Src/Gui/HexEditDialog.cpp
View File

@ -14,7 +14,7 @@ HexEditDialog::HexEditDialog(QWidget *parent) :
setModal(true); //modal window setModal(true); //modal window
//setup text fields //setup text fields
QFont font("Monospace", 8); QFont font("Monospace", 8, QFont::Normal, false);
font.setFixedPitch(true); font.setFixedPitch(true);
font.setStyleHint(QFont::Monospace); font.setStyleHint(QFont::Monospace);
ui->lineEditAscii->setFont(font); ui->lineEditAscii->setFont(font);

2
x64_dbg_gui/Project/Src/Gui/LogView.cpp
View File

@ -3,7 +3,7 @@
LogView::LogView(QWidget *parent) : QTextEdit(parent) LogView::LogView(QWidget *parent) : QTextEdit(parent)
{ {
QFont wFont("Monospace", 8); QFont wFont("Monospace", 8, QFont::Normal, false);
wFont.setStyleHint(QFont::Monospace); wFont.setStyleHint(QFont::Monospace);
wFont.setFixedPitch(true); wFont.setFixedPitch(true);

26
x64_dbg_gui/Project/Src/Gui/SettingsDialog.ui
View File

@ -39,7 +39,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="tabEvents"> <widget class="QWidget" name="tabEvents">
<attribute name="title"> <attribute name="title">
@ -50,8 +50,8 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>46</width> <width>241</width>
<height>13</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -207,7 +207,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>91</width> <width>241</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -220,7 +220,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>60</y> <y>60</y>
<width>121</width> <width>241</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -233,7 +233,7 @@
<rect> <rect>
<x>20</x> <x>20</x>
<y>30</y> <y>30</y>
<width>142</width> <width>231</width>
<height>19</height> <height>19</height>
</rect> </rect>
</property> </property>
@ -262,7 +262,7 @@
<rect> <rect>
<x>20</x> <x>20</x>
<y>80</y> <y>80</y>
<width>175</width> <width>231</width>
<height>19</height> <height>19</height>
</rect> </rect>
</property> </property>
@ -298,7 +298,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>110</y> <y>110</y>
<width>151</width> <width>241</width>
<height>17</height> <height>17</height>
</rect> </rect>
</property> </property>
@ -311,7 +311,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>130</y> <y>130</y>
<width>131</width> <width>241</width>
<height>17</height> <height>17</height>
</rect> </rect>
</property> </property>
@ -348,7 +348,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>101</width> <width>241</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -399,7 +399,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>111</width> <width>131</width>
<height>17</height> <height>17</height>
</rect> </rect>
</property> </property>
@ -412,7 +412,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>30</y> <y>30</y>
<width>101</width> <width>131</width>
<height>17</height> <height>17</height>
</rect> </rect>
</property> </property>
@ -425,7 +425,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>50</y> <y>50</y>
<width>71</width> <width>131</width>
<height>17</height> <height>17</height>
</rect> </rect>
</property> </property>

2
x64_dbg_gui/Project/Src/QHexEdit/QHexEditPrivate.cpp
View File

@ -14,7 +14,7 @@ QHexEditPrivate::QHexEditPrivate(QScrollArea *parent) : QWidget(parent)
_scrollArea = parent; _scrollArea = parent;
setOverwriteMode(true); setOverwriteMode(true);
QFont font("Monospace", 8); QFont font("Monospace", 8, QFont::Normal, false);
font.setFixedPitch(true); font.setFixedPitch(true);
font.setStyleHint(QFont::Monospace); font.setStyleHint(QFont::Monospace);
this->setFont(font); this->setFont(font);

4
x64_dbg_gui/Project/Src/main.cpp
View File

@ -42,6 +42,10 @@ int main(int argc, char *argv[])
{ {
MyApplication a(argc, argv); MyApplication a(argc, argv);
QFont font("Tahoma", 9, QFont::Bold, true);
font=QApplication::font();
QApplication::setFont(font);
// Register custom data types // Register custom data types
//qRegisterMetaType<int32>("int32"); //qRegisterMetaType<int32>("int32");
//qRegisterMetaType<uint_t>("uint_t"); //qRegisterMetaType<uint_t>("uint_t");