diff --git a/GUI/extenwindow.ui b/GUI/extenwindow.ui
index 8a945ae..495b38a 100644
--- a/GUI/extenwindow.ui
+++ b/GUI/extenwindow.ui
@@ -13,51 +13,69 @@
Extensions
+
+ QObject
+{
+ font: 10pt "MS Shell Dlg 2";
+}
+#textOutput
+{
+ font: 13pt "MS Shell Dlg 2";;
+}
+QPushButton, QComboBox
+{
+ padding-top: 3px;
+ padding-bottom: 3px;
+ padding-right: 5px;
+ padding-left: 5px;
+ text-align: left;
+}
+
-
- -
-
-
- QAbstractItemView::InternalMove
-
-
- Qt::MoveAction
-
-
-
- -
-
-
-
-
-
- Qt::Vertical
-
-
-
- -
-
-
- Add
-
-
-
- -
-
-
- Remove
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
-
-
-
+
+ -
+
+
+ QAbstractItemView::InternalMove
+
+
+ Qt::MoveAction
+
+
+
+ -
+
+
-
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+
+
+
diff --git a/GUI/mainwindow.cpp b/GUI/mainwindow.cpp
index b4aea98..c94c238 100644
--- a/GUI/mainwindow.cpp
+++ b/GUI/mainwindow.cpp
@@ -14,7 +14,6 @@ MainWindow::MainWindow(QWidget *parent) :
processCombo = findChild("processCombo");
ttCombo = findChild("ttCombo");
- extenCombo = findChild("extenCombo");
textOutput = findChild("textOutput");
if (settings.contains("Window")) this->setGeometry(settings.value("Window").toRect());
@@ -225,14 +224,14 @@ void MainWindow::on_saveButton_clicked()
file.write((hookList + "\r\n").toUtf8());
}
+void MainWindow::on_extenButton_clicked()
+{
+ extenWindow->activateWindow();
+ extenWindow->showNormal();
+}
+
void MainWindow::on_ttCombo_activated(int index)
{
textOutput->setPlainText(QString::fromStdWString(Host::GetThread(ParseTextThreadString(ttCombo->itemText(index)))->GetStorage()));
textOutput->moveCursor(QTextCursor::End);
}
-
-void MainWindow::on_addExtenButton_clicked()
-{
- extenWindow->activateWindow();
- extenWindow->showNormal();
-}
diff --git a/GUI/mainwindow.h b/GUI/mainwindow.h
index fc6f234..9494492 100644
--- a/GUI/mainwindow.h
+++ b/GUI/mainwindow.h
@@ -37,11 +37,11 @@ private slots:
void ThreadOutput(QString threadString, QString output); // this function doesn't take TextThread* because it might be destroyed on pipe thread
void on_attachButton_clicked();
void on_detachButton_clicked();
- void on_ttCombo_activated(int index);
void on_unhookButton_clicked();
void on_hookButton_clicked();
void on_saveButton_clicked();
- void on_addExtenButton_clicked();
+ void on_extenButton_clicked();
+ void on_ttCombo_activated(int index);
private:
bool ProcessThreadOutput(TextThread* thread, std::wstring& output);
@@ -55,7 +55,6 @@ private:
QSettings settings = QSettings("Textractor.ini", QSettings::IniFormat);
QComboBox* processCombo;
QComboBox* ttCombo;
- QComboBox* extenCombo;
QPlainTextEdit* textOutput;
QWidget* extenWindow;
};
diff --git a/GUI/mainwindow.ui b/GUI/mainwindow.ui
index b3d9271..e3aaf74 100644
--- a/GUI/mainwindow.ui
+++ b/GUI/mainwindow.ui
@@ -6,16 +6,10 @@
0
0
- 949
+ 900
600
-
-
- 2
- 0
-
-
Textractor
@@ -38,269 +32,113 @@ QPushButton, QComboBox
}
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
+
-
-
-
-
- 0
- 0
-
+
+
+ true
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
+
- 4
+ 0
- 4
+ 0
- 4
+ 0
- 4
+ 0
-
-
-
- true
-
-
-
- 2
- 0
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- false
-
-
- QComboBox::InsertAtBottom
-
-
- QComboBox::AdjustToContents
-
-
-
- -
-
-
- Attach to game
-
-
-
- -
-
-
- Detach from game
-
-
-
- -
-
-
- Add hook
-
-
-
- -
-
-
- Remove hook
-
-
-
- -
-
-
- Save hook(s)
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- false
-
-
- QComboBox::AdjustToContents
-
-
-
- -
-
-
- Add extension
-
-
-
- -
-
-
- Move extension
-
-
-
- -
-
-
- Remove extension
-
-
-
-
-
-
-
-
-
- -
-
-
-
- 6
- 0
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
- 4
-
-
- 4
-
-
- 4
-
-
- 4
-
-
-
-
+
false
-
- 50
+
+ QComboBox::InsertAtBottom
+
+
+ QComboBox::AdjustToContents
-
-
-
-
- 5
- 0
-
-
-
- true
+
+
+ Attach to game
+ -
+
+
+ Detach from game
+
+
+
+ -
+
+
+ Add hook
+
+
+
+ -
+
+
+ Remove hook
+
+
+
+ -
+
+
+ Save hook(s)
+
+
+
+ -
+
+
+ Extensions
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+ 50
+
+
+
+ -
+
+
+ true
+
+
+
+
+
-