mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Read/save from ~/.config/ede/eiconman.conf instead local directory

Browse Source 
Removed Apply button; OK button should do the work
This commit is contained in:
Sanel Zukan 2008-08-10 17:47:05 +00:00
parent b792d13603
commit 5e1ed7064d
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
edesktopconf/edesktopconf.cpp
View File

@ -14,17 +14,18 @@
#include <config.h> #include <config.h>
#endif #endif
#include <unistd.h>
#include <string.h>
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include <edelib/Color.h> #include <edelib/Color.h>
#include <edelib/Window.h> #include <edelib/Window.h>
#include <edelib/Config.h> #include <edelib/Resource.h>
#include <edelib/Debug.h> #include <edelib/Debug.h>
#include <edelib/Util.h> #include <edelib/Util.h>
#include <edelib/FontChooser.h> #include <edelib/FontChooser.h>
#include <edelib/Directory.h> #include <edelib/Directory.h>
#include <string.h>
#include <FL/Fl.H> #include <FL/Fl.H>
#include <FL/Fl_Tabs.H> #include <FL/Fl_Tabs.H>
#include <FL/Fl_Group.H> #include <FL/Fl_Group.H>
@ -42,7 +43,8 @@
#include <FL/x.h> #include <FL/x.h>
#define EICOMAN_UID 0x10 #define EICOMAN_UID 0x10
#define EICOMAN_CONFIG "../eiconman/eiconman.conf" //#define EICOMAN_CONFIG "../eiconman/eiconman.conf"
#define EICOMAN_CONFIG "ede/eiconman"
Fl_Menu_Item mode_menu[] = { Fl_Menu_Item mode_menu[] = {
{_("Center"), 0, 0}, {_("Center"), 0, 0},
@ -199,7 +201,7 @@ void close_cb(Fl_Widget*, void* w) {
win->hide(); win->hide();
} }
void color_cb(Fl_Button* btn, void*) { void color_cb(Fl_Widget* btn, void*) {
unsigned char r, g, b; unsigned char r, g, b;
edelib::color_fltk_to_rgb(btn->color(), r, g, b); edelib::color_fltk_to_rgb(btn->color(), r, g, b);
@ -218,6 +220,7 @@ void wallpaper_color_cb(Fl_Widget*, void* w) {
if(fl_color_chooser(_("Choose color"), r, g, b)) { if(fl_color_chooser(_("Choose color"), r, g, b)) {
Fl_Color c = (Fl_Color)edelib::color_rgb_to_fltk(r, g, b); Fl_Color c = (Fl_Color)edelib::color_rgb_to_fltk(r, g, b);
desk_background_color->color(c); desk_background_color->color(c);
desk_background_color->redraw();
wallpaper->color(c); wallpaper->color(c);
wallpaper_img->redraw(); wallpaper_img->redraw();
wallpaper->redraw(); wallpaper->redraw();
@ -225,7 +228,7 @@ void wallpaper_color_cb(Fl_Widget*, void* w) {
} }
void browse_cb(Fl_Widget*, void*) { void browse_cb(Fl_Widget*, void*) {
char* ret = fl_file_chooser(_("Background image"), "*.jpg\t*.png", NULL); char* ret = fl_file_chooser(_("Background image"), "*.jpg\t*.png", desk_background->value());
if(!ret) if(!ret)
return; return;
@ -249,7 +252,7 @@ void choice_cb(Fl_Widget*, void*) {
} }
void apply_cb(Fl_Widget*, void* w) { void apply_cb(Fl_Widget*, void* w) {
edelib::Config conf; edelib::Resource conf;
conf.set("Desktop", "Color", (int)desk_background_color->color()); conf.set("Desktop", "Color", (int)desk_background_color->color());
conf.set("Desktop", "WallpaperUse", desk_use_wallpaper->value()); conf.set("Desktop", "WallpaperUse", desk_use_wallpaper->value());
conf.set("Desktop", "WallpaperMode", desk_background_mode->value()); conf.set("Desktop", "WallpaperMode", desk_background_mode->value());
@ -257,13 +260,13 @@ void apply_cb(Fl_Widget*, void* w) {
if(desk_background->value()) if(desk_background->value())
conf.set("Desktop", "Wallpaper", desk_background->value()); conf.set("Desktop", "Wallpaper", desk_background->value());
conf.set("Icons", "Label Background", (int)icon_background_color->color()); conf.set("Icons", "LabelBackground", (int)icon_background_color->color());
conf.set("Icons", "Label Foreground", (int)icon_label_color->color()); conf.set("Icons", "LabelForeground", (int)icon_label_color->color());
conf.set("Icons", "Label Font", icon_font); conf.set("Icons", "LabelFont", icon_font);
conf.set("Icons", "Label Fontsize", icon_font_size); conf.set("Icons", "LabelFontsize", icon_font_size);
conf.set("Icons", "Label Maxwidth", icon_label_width->value()); conf.set("Icons", "LabelMaxwidth", icon_label_width->value());
conf.set("Icons", "Label Transparent", icon_show_background_color->value()); conf.set("Icons", "LabelTransparent", icon_show_background_color->value());
conf.set("Icons", "Label Visible", icon_show_label->value()); conf.set("Icons", "LabelVisible", icon_show_label->value());
conf.set("Icons", "OneClickExec", engage_with_one_click->value()); conf.set("Icons", "OneClickExec", engage_with_one_click->value());
if(conf.save(EICOMAN_CONFIG)) if(conf.save(EICOMAN_CONFIG))
@ -273,6 +276,8 @@ void apply_cb(Fl_Widget*, void* w) {
void ok_cb(Fl_Widget*, void* w) { void ok_cb(Fl_Widget*, void* w) {
edelib::Window* win = (edelib::Window*)w; edelib::Window* win = (edelib::Window*)w;
apply_cb(0, win); apply_cb(0, win);
/* a hack so edesktopconf can send a message before it was closed */
sleep(1);
win->hide(); win->hide();
} }
@ -302,7 +307,7 @@ void load_settings(void) {
int i_label_width = 55; int i_label_width = 55;
bool one_click = false; bool one_click = false;
edelib::Config conf; edelib::Resource conf;
char wpath[256]; char wpath[256];
bool wpath_found = false; bool wpath_found = false;
@ -316,17 +321,16 @@ void load_settings(void) {
else else
wpath_found = false; wpath_found = false;
conf.get("Icons", "Label Background", i_background_color, i_background_color); conf.get("Icons", "LabelBackground", i_background_color, i_background_color);
conf.get("Icons", "Label Foreground", i_label_color, i_label_color); conf.get("Icons", "LabelForeground", i_label_color, i_label_color);
conf.get("Icons", "Label Font", icon_font, 1); conf.get("Icons", "LabelFont", icon_font, 1);
conf.get("Icons", "Label Fontsize", icon_font_size, 12); conf.get("Icons", "LabelFontsize", icon_font_size, 12);
conf.get("Icons", "Label Maxwidth", i_label_width, i_label_width); conf.get("Icons", "LabelMaxwidth", i_label_width, i_label_width);
conf.get("Icons", "Label Transparent",i_show_background_color, i_show_background_color); conf.get("Icons", "LabelTransparent",i_show_background_color, i_show_background_color);
conf.get("Icons", "Label Visible", i_show_label, i_show_label); conf.get("Icons", "LabelVisible", i_show_label, i_show_label);
conf.get("Icons", "OneClickExec", one_click, one_click); conf.get("Icons", "OneClickExec", one_click, one_click);
} }
desk_background_color->color(d_background_color); desk_background_color->color(d_background_color);
wallpaper->color(d_background_color); wallpaper->color(d_background_color);
desk_background_mode->value(b_mode); desk_background_mode->value(b_mode);
@ -350,9 +354,6 @@ void load_settings(void) {
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
Fl::set_fonts("iso8859-2");
Fl::set_font(FL_HELVETICA, "-*-helvetica-medium-r-*-*-12-*-*-*-*-*-iso8859-2");
int show_group = 1; int show_group = 1;
if(argc > 1) { if(argc > 1) {
if(strcmp(argv[1], "--desktop") == 0) if(strcmp(argv[1], "--desktop") == 0)
@ -461,12 +462,10 @@ int main(int argc, char** argv) {
g3->end(); g3->end();
tabs->end(); tabs->end();
Fl_Button* ok = new Fl_Button(260, 250, 90, 25, _("&OK")); /* Fl_Button* ok = new Fl_Button(260, 250, 90, 25, _("&OK"));
ok->callback(ok_cb, win); */
Fl_Button* ok = new Fl_Button(355, 250, 90, 25, _("&OK"));
ok->callback(ok_cb, win); ok->callback(ok_cb, win);
//ok->labelfont((Fl_Font)18);
//ok->labelsize(14);
Fl_Button* apply = new Fl_Button(355, 250, 90, 25, _("&Apply"));
apply->callback(apply_cb, win);
Fl_Button* cancel = new Fl_Button(450, 250, 90, 25, _("&Cancel")); Fl_Button* cancel = new Fl_Button(450, 250, 90, 25, _("&Cancel"));
cancel->callback(close_cb, win); cancel->callback(close_cb, win);
win->end(); win->end();