projects
/
simple-launcher
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added one more TODO item
[simple-launcher]
/
launcher-item.h
diff --git
a/launcher-item.h
b/launcher-item.h
index
e55ea35
..
af40ca2
100644
(file)
--- a/
launcher-item.h
+++ b/
launcher-item.h
@@
-21,6
+21,7
@@
#include <vector>
#include <map>
#include <string>
#include <vector>
#include <map>
#include <string>
+#include <algorithm>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtkicontheme.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtkicontheme.h>
@@
-35,9
+36,10
@@
public:
GdkPixbuf *getIcon(int icon_size) const;
const std::string& getFileName() const { return myFileName; }
GdkPixbuf *getIcon(int icon_size) const;
const std::string& getFileName() const { return myFileName; }
- const std::string& getName() const { return myName; }
- const std::string& getComment() const { return myComment; }
+ std::string getName(bool translate = true) const { return translate ? translateString(myName) : myName; }
+ std::string getComment(bool translate = true) const { return translate ? translateString(myComment) : myComment; }
const std::string& getService() const { return myService; }
const std::string& getService() const { return myService; }
+ const std::string& getExec() const { return myExec; }
bool isEnabled(void) const { return myEnabled; }
bool isEnabled(void) const { return myEnabled; }
@@
-51,17
+53,19
@@
public:
}
}
}
}
+ bool checkSanity(void) { return !myName.empty() && (!myService.empty() || !myExec.empty()); }
+
private:
private:
- bool checkSanity(void) { return !(myName.empty() || myIcon.empty() || myService.empty()); }
+ std::string translateString(const std::string& what) const;
private:
private:
- std::string myFileName, myName, myComment, myIcon, myService;
+ std::string myFileName, myName, myComment, myIcon, myService, myExec, myTextDomain;
bool myEnabled;
static GtkIconTheme *ourTheme;
};
bool myEnabled;
static GtkIconTheme *ourTheme;
};
-typedef struct {
+struct LauncherItems {
typedef std::vector<std::string> Names;
typedef std::map<std::string, LauncherItem *> Items;
typedef std::vector<std::string> Names;
typedef std::map<std::string, LauncherItem *> Items;
@@
-69,7
+73,7
@@
typedef struct {
Items myItems;
bool exists(const std::string& name) {
Items myItems;
bool exists(const std::string& name) {
- return myNames.find(name) != myNames.end();
+ return std::find(myNames.begin(), myNames.end(), name) != myNames.end();
}
size_t size() { return myNames.size(); }
}
size_t size() { return myNames.size(); }
@@
-102,7
+106,14
@@
typedef struct {
myNames.resize(0);
myItems.clear();
}
myNames.resize(0);
myItems.clear();
}
-} LauncherItems;
+
+ LauncherItems& operator=(const LauncherItems& that) {
+ myNames = that.myNames;
+ myItems = that.myItems;
+
+ return *this;
+ }
+};
#endif
#endif