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

removed strftimeformat resource, it is in clocktool now

Browse source
This commit is contained in:
fluxgen 2003-08-11 16:27:23 +00:00
parent e9e60037b0
commit f6d07eacb3
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.213 2003/08/10 12:50:04 rathnor Exp $ // $Id: Screen.cc,v 1.214 2003/08/11 16:27:23 fluxgen Exp $
#include "Screen.hh" #include "Screen.hh"
@ -356,9 +356,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
menuTheme()->titleFont().setAntialias(*resource.antialias); menuTheme()->titleFont().setAntialias(*resource.antialias);
menuTheme()->frameFont().setAntialias(*resource.antialias); menuTheme()->frameFont().setAntialias(*resource.antialias);
// load database for theme engine
FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename().c_str());
// create geometry window // create geometry window
@ -435,8 +432,8 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
m_configmenu->update(); m_configmenu->update();
#ifdef SLIT #ifdef SLIT
if (slit()) // this will load theme and reconfigure slit // if (slit()) // this will load theme and reconfigure slit
FbTk::ThemeManager::instance().loadTheme(slit()->theme()); // FbTk::ThemeManager::instance().loadTheme(slit()->theme());
#endif // SLIT #endif // SLIT
// start with workspace 0 // start with workspace 0
@ -495,6 +492,9 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
rm.unlock(); rm.unlock();
XFree(children); XFree(children);
FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename().c_str());
XFlush(disp); XFlush(disp);
} }
@ -505,7 +505,6 @@ BScreen::~BScreen() {
if (geom_pixmap != None) if (geom_pixmap != None)
imageControl().removeImage(geom_pixmap); imageControl().removeImage(geom_pixmap);
removeWorkspaceNames(); removeWorkspaceNames();
Workspaces::iterator w_it = m_workspaces_list.begin(); Workspaces::iterator w_it = m_workspaces_list.begin();
@ -614,8 +613,8 @@ void BScreen::reconfigure() {
m_menutheme->frameFont().setAntialias(*resource.antialias); m_menutheme->frameFont().setAntialias(*resource.antialias);
// load theme // load theme
std::string theme_filename(Fluxbox::instance()->getStyleFilename()); // std::string theme_filename(Fluxbox::instance()->getStyleFilename());
FbTk::ThemeManager::instance().load(theme_filename.c_str()); // FbTk::ThemeManager::instance().load(theme_filename.c_str());
I18n *i18n = I18n::instance(); I18n *i18n = I18n::instance();
@ -697,7 +696,7 @@ void BScreen::reconfigure() {
m_icon_list.end(), m_icon_list.end(),
mem_fun(&FluxboxWindow::reconfigure)); mem_fun(&FluxboxWindow::reconfigure));
imageControl().timeout(); imageControl().cleanCache();
// notify objects that the screen is reconfigured // notify objects that the screen is reconfigured
m_reconfigure_sig.notify(); m_reconfigure_sig.notify();
} }
@ -865,6 +864,7 @@ void BScreen::changeWorkspaceID(unsigned int id) {
focused = focused_client->fbwindow(); focused = focused_client->fbwindow();
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__FUNCTION__<<"): "<<focused_client<<endl;
cerr<<__FILE__<<"("<<__FUNCTION__<<"): focused = "<<focused<<endl; cerr<<__FILE__<<"("<<__FUNCTION__<<"): focused = "<<focused<<endl;
#endif // DEBUG #endif // DEBUG
@ -1248,12 +1248,6 @@ void BScreen::updateAvailableWorkspaceArea() {
MaxArea(*m_available_workspace_area.get())); MaxArea(*m_available_workspace_area.get()));
} }
void BScreen::saveStrftimeFormat(const char *format) {
//make sure std::string don't get 0 string
resource.strftime_format = (format ? format : "");
}
void BScreen::addWorkspaceName(const char *name) { void BScreen::addWorkspaceName(const char *name) {
m_workspace_names.push_back(name); m_workspace_names.push_back(name);
} }