projects
/
pierogi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfixes and Keysets
[pierogi]
/
pirpanelmanager.cpp
diff --git
a/pirpanelmanager.cpp
b/pirpanelmanager.cpp
index
c8c64b2
..
e6feafc
100644
(file)
--- a/
pirpanelmanager.cpp
+++ b/
pirpanelmanager.cpp
@@
-15,6
+15,7
@@
#include "forms/piraudiodeviceform.h"
#include "forms/pircameraform.h"
#include "forms/pirroombaform.h"
#include "forms/piraudiodeviceform.h"
#include "forms/pircameraform.h"
#include "forms/pirroombaform.h"
+#include "forms/pirmacroform.h"
#include "forms/pirpowersearchform.h"
#include "mainwindow.h"
#include "forms/pirpowersearchform.h"
#include "mainwindow.h"
@@
-44,6
+45,7
@@
PIRPanelManager::PIRPanelManager(
audioDeviceForm(0),
cameraForm(0),
roombaForm(0),
audioDeviceForm(0),
cameraForm(0),
roombaForm(0),
+ macroForm(0),
powerSearchForm(0),
altMainPanelFlag(false),
currentTabsName(Universal_Tabs),
powerSearchForm(0),
altMainPanelFlag(false),
currentTabsName(Universal_Tabs),
@@
-52,7
+54,16
@@
PIRPanelManager::PIRPanelManager(
QSettings settings("pietrzak.org", "Pierogi");
if (settings.contains("currentTabsName"))
{
QSettings settings("pietrzak.org", "Pierogi");
if (settings.contains("currentTabsName"))
{
- currentTabsName = PIRTabBarName(settings.value("currentTabsName").toInt());
+ int tabVal = settings.value("currentTabsName").toInt();
+
+ if (tabVal >= Last_Tabs_Marker)
+ {
+ currentTabsName = Universal_Tabs;
+ }
+ else
+ {
+ currentTabsName = PIRTabBarName(tabVal);
+ }
}
// Set up the panel names:
}
// Set up the panel names:
@@
-98,6
+109,9
@@
PIRPanelManager::PIRPanelManager(
shortPanelNames[Roomba_Panel] = "Roomba";
longPanelNames[Roomba_Panel] =
"Roomba Panel - robotic vacuum cleaner controls";
shortPanelNames[Roomba_Panel] = "Roomba";
longPanelNames[Roomba_Panel] =
"Roomba Panel - robotic vacuum cleaner controls";
+ shortPanelNames[Macro_Panel] = "Edit Macros";
+ longPanelNames[Macro_Panel] =
+ "Edit Macros Panel - create, delete, edit, and manage macros";
shortPanelNames[PowerSearch_Panel] = "Keyset Search";
longPanelNames[PowerSearch_Panel] =
"Keyset Search Panel - execute power button in each keyset";
shortPanelNames[PowerSearch_Panel] = "Keyset Search";
longPanelNames[PowerSearch_Panel] =
"Keyset Search Panel - execute power button in each keyset";
@@
-147,6
+161,9
@@
PIRPanelManager::PIRPanelManager(
roombaForm = new PIRRoombaForm(mainWindow);
panels[Roomba_Panel] = roombaForm;
roombaForm = new PIRRoombaForm(mainWindow);
panels[Roomba_Panel] = roombaForm;
+ macroForm = new PIRMacroForm(mainWindow);
+ panels[Macro_Panel] = macroForm;
+
powerSearchForm = new PIRPowerSearchForm(mainWindow);
panels[PowerSearch_Panel] = powerSearchForm;
powerSearchForm = new PIRPowerSearchForm(mainWindow);
panels[PowerSearch_Panel] = powerSearchForm;
@@
-210,6
+227,11
@@
PIRPanelManager::PIRPanelManager(
pset.push_back(Roomba_Panel);
tabLists[Roomba_Tabs] = pset;
pset.push_back(Roomba_Panel);
tabLists[Roomba_Tabs] = pset;
+ // The Macro Management collection:
+ pset.clear();
+ pset.push_back(Macro_Panel);
+ tabLists[Macro_Tabs] = pset;
+
// The Power Search collection:
pset.clear();
pset.push_back(PowerSearch_Panel);
// The Power Search collection:
pset.clear();
pset.push_back(PowerSearch_Panel);