projects
/
pierogi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Possible Uninstall Fix, plus cleanup, more keysets
[pierogi]
/
mainwindow.h
diff --git
a/mainwindow.h
b/mainwindow.h
index
b80c2ca
..
1c4c1b2
100644
(file)
--- a/
mainwindow.h
+++ b/
mainwindow.h
@@
-2,16
+2,17
@@
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
#define MAINWINDOW_H
#include <QtGui/QMainWindow>
-#include <QListWidgetItem>
-//#include <QThread>
-
-//#include "selectionwindow.h"
-#include "pirselectkeysetform.h"
-#include "pirdocumentationform.h"
-#include "piraboutform.h"
-#include "pirkeysetmanager.h"
+
+#include "pirkeynames.h"
#include "pirmodprobe.h"
#include "pirmodprobe.h"
+class QListWidgetItem;
+class PIRSelectKeysetForm;
+class PIRSecondaryForm;
+class PIRDocumentationForm;
+class PIRAboutForm;
+class PIRKeysetManager;
+
namespace Ui {
class MainWindow;
}
namespace Ui {
class MainWindow;
}
@@
-35,6
+36,11
@@
public:
void showExpanded();
void showExpanded();
+ void startRepeating(
+ PIRKeyName name);
+
+ void stopRepeating();
+
signals:
// Main keys
void powerEnabled(bool);
signals:
// Main keys
void powerEnabled(bool);
@@
-100,6
+106,7
@@
signals:
void replayEnabled(bool);
void ejectEnabled(bool);
void replayEnabled(bool);
void ejectEnabled(bool);
+/*
// Media2 Keys
void discTitleEnabled(bool);
void discSelectEnabled(bool);
// Media2 Keys
void discTitleEnabled(bool);
void discSelectEnabled(bool);
@@
-135,6
+142,7
@@
signals:
void pipChannelDownEnabled(bool);
void pipPauseEnabled(bool);
void pipSizeEnabled(bool);
void pipChannelDownEnabled(bool);
void pipPauseEnabled(bool);
void pipSizeEnabled(bool);
+*/
void keysetMakeChanged(QString);
void keysetNameChanged(QString);
void keysetMakeChanged(QString);
void keysetNameChanged(QString);
@@
-268,6
+276,7
@@
private slots:
void on_ejectButton_pressed();
void on_ejectButton_released();
void on_ejectButton_pressed();
void on_ejectButton_released();
+/*
// Media2 tab slots:
void on_discTitleButton_pressed();
void on_discTitleButton_released();
// Media2 tab slots:
void on_discTitleButton_pressed();
void on_discTitleButton_released();
@@
-335,6
+344,7
@@
private slots:
void on_pipPauseButton_released();
void on_pipSizeButton_pressed();
void on_pipSizeButton_released();
void on_pipPauseButton_released();
void on_pipSizeButton_pressed();
void on_pipSizeButton_released();
+*/
// Favorites tab actions:
void on_addKeysetButton_clicked();
// Favorites tab actions:
void on_addKeysetButton_clicked();
@@
-342,6
+352,7
@@
private slots:
// Menu actions:
void on_actionSelectKeyset_triggered();
// Menu actions:
void on_actionSelectKeyset_triggered();
+ void on_actionSecondary_Buttons_triggered();
void on_actionAbout_triggered();
void on_actionDocumentation_triggered();
void on_actionAbout_triggered();
void on_actionDocumentation_triggered();
@@
-354,17
+365,12
@@
private slots:
private:
void enableButtons();
private:
void enableButtons();
- void startRepeating(
- unsigned int id,
- PIRKeyName name);
-
- void stopRepeating();
-
void populateFavorites();
Ui::MainWindow *ui;
PIRSelectKeysetForm *selectKeysetForm;
void populateFavorites();
Ui::MainWindow *ui;
PIRSelectKeysetForm *selectKeysetForm;
+ PIRSecondaryForm *secondaryForm;
PIRDocumentationForm *documentationForm;
PIRAboutForm *aboutForm;
PIRDocumentationForm *documentationForm;
PIRAboutForm *aboutForm;