nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

screen based theme loading

Browse source
This commit is contained in:
fluxgen 2003-12-29 11:04:09 +00:00
parent 33f69f1815
commit 0c4b5306cd
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/FbTk/Theme.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: Theme.cc,v 1.22 2003/12/03 00:18:58 fluxgen Exp $
// $Id: Theme.cc,v 1.23 2003/12/29 11:04:09 fluxgen Exp $
#include "Theme.hh"
@ -73,7 +73,8 @@ bool ThemeManager::unregisterTheme(Theme &tm) {
return true;
}
bool ThemeManager::load(const std::string &filename) {
bool ThemeManager::load(const std::string &filename, int screen_num) {
cerr<<"Load Theme: "<<filename<<endl;
std::string location = FbTk::StringUtil::expandFilename(filename);
std::string prefix = "";
@ -107,11 +108,15 @@ bool ThemeManager::load(const std::string &filename) {
location.append("/pixmaps");
Image::addSearchPath(location);
//get list and go throu all the resources and load them
// get list and go throu all the resources and load them
ThemeList::iterator theme_it = m_themelist.begin();
const ThemeList::iterator theme_it_end = m_themelist.end();
for (; theme_it != theme_it_end; ++theme_it) {
loadTheme(**theme_it);
if (screen_num < 0)
loadTheme(**theme_it);
else if (screen_num == (*theme_it)->screenNum()) // specified screen
loadTheme(**theme_it);
}
// notify all themes that we reconfigured
theme_it = m_themelist.begin();

6
src/FbTk/Theme.hh
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: Theme.hh,v 1.13 2003/12/17 00:43:22 fluxgen Exp $
// $Id: Theme.hh,v 1.14 2003/12/29 11:04:09 fluxgen Exp $
/**
@file holds ThemeItem<T>, Theme and ThemeManager which is the base for any theme
@ -124,8 +124,8 @@ private:
class ThemeManager {
public:
static ThemeManager &instance();
bool load(const std::string &filename);
/// load style file "filename" to screen
bool load(const std::string &filename, int screen_num = -1);
std::string resourceValue(const std::string &name, const std::string &altname);
void loadTheme(Theme &tm);
bool loadItem(ThemeItem_base &resource);