X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=pirkeynames.h;h=9a4ee0ffbaba8a01e881bbadfca37933caa453e7;hb=HEAD;hp=16abe63ef110fd0c5057747c2b2a0f21f45b8031;hpb=c368b9d2216660ed7541cad6919338a3538a644b;p=pierogi

diff --git a/pirkeynames.h b/pirkeynames.h
index 16abe63..9a4ee0f 100644
--- a/pirkeynames.h
+++ b/pirkeynames.h
@@ -8,6 +8,23 @@ enum PIRKeyName{
   // The "Unmapped" key is a placeholder for commands with no key mapping:
   Unmapped_Key,
 
+  // Power control:
+  Power_Key,
+  PowerOn_Key,
+  PowerOff_Key,
+
+  // Menu control:
+  Menu_Key,
+  Up_Key,
+  Down_Key,
+  Left_Key,
+  Right_Key,
+  Select_Key,
+  Exit_Key,
+  PageUp_Key,
+  PageDown_Key,
+  Guide_Key,
+
   // Number keys:
   Zero_Key,
   One_Key,
@@ -27,11 +44,6 @@ enum PIRKeyName{
   Dash_Key,
   DoubleDigit_Key,
 
-  // Power control:
-  Power_Key,
-  PowerOn_Key,
-  PowerOff_Key,
-
   // Volume control:
   VolumeUp_Key,
   VolumeDown_Key,
@@ -78,18 +90,6 @@ enum PIRKeyName{
   RecordTimed_Key,
   RecordPDC_Key,
 
-  // Menu control:
-  Menu_Key,
-  Up_Key,
-  Down_Key,
-  Left_Key,
-  Right_Key,
-  Select_Key,
-  Exit_Key,
-  PageUp_Key,
-  PageDown_Key,
-  Guide_Key,
-
   // Color buttons:
   Red_Key,
   Green_Key,
@@ -160,6 +160,9 @@ enum PIRKeyName{
   ContrastDown_Key,
   BalanceRight_Key,
   BalanceLeft_Key,
+  Keystone_Key,
+  PictureMute_Key,
+  Focus_Key,
 
   // Input Controls:
   Input_Key,
@@ -227,6 +230,10 @@ enum PIRKeyName{
   RobotMax_Key,
   RobotClean_Key,
 
+  // Camera controls:
+  OpenShutter_Key,
+  DelayedOpenShutter_Key,
+
   // Other keys:
   Captions_Key,
   Info_Key,
@@ -241,4 +248,32 @@ enum PIRKeyName{
   Mode_Key
 };
 
+
+// Need to make the key names visible to users now:
+#include <map>
+#include <QString>
+typedef std::map<PIRKeyName, QString> KeynameCollection;
+typedef std::map<QString, PIRKeyName> ReverseKeynameCollection;
+
+class QComboBox;
+
+class PIRKeynameMgr
+{
+public:
+  PIRKeynameMgr();
+
+  QString getKeynameString(
+    PIRKeyName keyname);
+
+  PIRKeyName getKeynameID(
+    QString keynameString);
+
+  void populateComboBox(
+    QComboBox *cb);
+
+private:
+  KeynameCollection keynameStrings;
+  ReverseKeynameCollection keynameIDs;
+};
+
 #endif // PIRKEYNAMES_H