diff options
Diffstat (limited to 'src/Resources.cc')
-rw-r--r-- | src/Resources.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Resources.cc b/src/Resources.cc index df0f926..60c7461 100644 --- a/src/Resources.cc +++ b/src/Resources.cc | |||
@@ -76,18 +76,20 @@ setFromString(char const *strval) { | |||
76 | //clear old values | 76 | //clear old values |
77 | m_value.clear(); | 77 | m_value.clear(); |
78 | 78 | ||
79 | std::string v; | ||
79 | for (size_t i = 0; i < val.size(); i++) { | 80 | for (size_t i = 0; i < val.size(); i++) { |
80 | if (strcasecmp(val[i].c_str(), "Maximize")==0) | 81 | v = FbTk::StringUtil::toLower(val[i]); |
82 | if (v == "maximize") | ||
81 | m_value.push_back(WinButton::MAXIMIZE); | 83 | m_value.push_back(WinButton::MAXIMIZE); |
82 | else if (strcasecmp(val[i].c_str(), "Minimize")==0) | 84 | else if (v == "minimize") |
83 | m_value.push_back(WinButton::MINIMIZE); | 85 | m_value.push_back(WinButton::MINIMIZE); |
84 | else if (strcasecmp(val[i].c_str(), "Shade")==0) | 86 | else if (v == "shade") |
85 | m_value.push_back(WinButton::SHADE); | 87 | m_value.push_back(WinButton::SHADE); |
86 | else if (strcasecmp(val[i].c_str(), "Stick")==0) | 88 | else if (v == "stick") |
87 | m_value.push_back(WinButton::STICK); | 89 | m_value.push_back(WinButton::STICK); |
88 | else if (strcasecmp(val[i].c_str(), "MenuIcon")==0) | 90 | else if (v == "menuIcon") |
89 | m_value.push_back(WinButton::MENUICON); | 91 | m_value.push_back(WinButton::MENUICON); |
90 | else if (strcasecmp(val[i].c_str(), "Close")==0) | 92 | else if (v == "close") |
91 | m_value.push_back(WinButton::CLOSE); | 93 | m_value.push_back(WinButton::CLOSE); |
92 | } | 94 | } |
93 | } | 95 | } |
@@ -111,7 +113,7 @@ setFromString(const char *strval) { | |||
111 | template<> | 113 | template<> |
112 | void FbTk::Resource<long long>:: | 114 | void FbTk::Resource<long long>:: |
113 | setFromString(const char *strval) { | 115 | setFromString(const char *strval) { |
114 | if (sscanf(strval, "%llu", &m_value) != 1) | 116 | if (sscanf(strval, "%lld", &m_value) != 1) |
115 | setDefaultValue(); | 117 | setDefaultValue(); |
116 | } | 118 | } |
117 | 119 | ||