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

Replacing FLTK menus with the ones from edelib.

Browse Source 
Some icons in menus
This commit is contained in:
Sanel Zukan 2009-07-09 13:26:59 +00:00
parent f137dc9f2d
commit 4bc8027cb7
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ede-desktop/ede-desktop.cpp
View File

@ -24,7 +24,6 @@
#include <FL/fl_draw.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Shared_Image.H>
#include <FL/Fl_Menu_Button.H>
#include <edelib/Debug.h>
#include <edelib/FileTest.h>
@ -38,6 +37,7 @@
#include <edelib/Util.h>
#include <edelib/Nls.h>
#include <edelib/MessageBox.h>
#include <edelib/MenuButton.h>
#include "ede-desktop.h"
#include "DesktopIcon.h"
@ -68,17 +68,17 @@
static void background_conf_cb(Fl_Widget*, void*);
static void icons_conf_cb(Fl_Widget*, void*);
Fl_Menu_Item desktop_menu[] = {
{_(" Create &launcher... "), 0, 0},
{_(" Create &folder... "), 0, 0, 0, FL_MENU_DIVIDER},
{_(" &Arrange "), 0, 0, 0, FL_SUBMENU | FL_MENU_DIVIDER},
{_(" &Vertical line up "), 0, 0},
{_(" &Horizontal line up "), 0, 0},
edelib::MenuItem desktop_menu[] = {
{_("Create &launcher..."), 0, 0},
{_("Create &folder..."), 0, 0, 0, FL_MENU_DIVIDER},
{_("&Arrange"), 0, 0, 0, FL_SUBMENU | FL_MENU_DIVIDER},
{_("&Vertical line up"), 0, 0},
{_("&Horizontal line up"), 0, 0},
{0},
{_(" &Copy "), 0, 0},
{_(" &Paste "), 0, 0, 0, FL_MENU_DIVIDER},
{_(" &Icons settings... "), 0, icons_conf_cb, 0},
{_(" &Background... "), 0, background_conf_cb, 0},
{_("&Copy"), 0, 0},
{_("&Paste"), 0, 0, 0, FL_MENU_DIVIDER},
{_("&Icons settings..."), 0, icons_conf_cb, 0},
{_("&Background..."), 0, background_conf_cb, 0},
{0}
};
@ -189,8 +189,11 @@ void Desktop::init_internals(void) {
* added (wallpaper, menu, ...) then icons, so they can be drawn at top of them.
*/
begin();
dmenu = new Fl_Menu_Button(0, 0, 0, 0);
dmenu = new edelib::MenuButton(0, 0, 500, 0);
dmenu->menu(desktop_menu);
desktop_menu[1].image(edelib::IconLoader::get("folder", edelib::ICON_SIZE_TINY));
desktop_menu[6].image(edelib::IconLoader::get("edit-copy", edelib::ICON_SIZE_TINY));
desktop_menu[7].image(edelib::IconLoader::get("edit-paste", edelib::ICON_SIZE_TINY));
wallpaper = new Wallpaper(0, 0, w(), h());
end();
@ -955,7 +958,7 @@ int Desktop::handle(int event) {
selbox->x = Fl::event_x();
selbox->y = Fl::event_y();
} else if(Fl::event_button() == 3) {
const Fl_Menu_Item* item = dmenu->menu()->popup(Fl::event_x(), Fl::event_y());
const edelib::MenuItem* item = dmenu->menu()->popup(Fl::event_x(), Fl::event_y());
dmenu->picked(item);
}

4
ede-desktop/ede-desktop.h
View File

@ -26,6 +26,7 @@
#include <edelib/Resource.h>
#include <edelib/List.h>
#include <edelib/EdbusConnection.h>
#include <edelib/MenuButton.h>
#define EDAMAGE_CHILD_LABEL 0x10
#define EDAMAGE_OVERLAY 0x20
@ -78,7 +79,6 @@ struct SelectionOverlay {
class Wallpaper;
class DesktopIcon;
class Fl_Menu_Button;
typedef edelib::list<DesktopIcon*> DesktopIconList;
typedef edelib::list<DesktopIcon*>::iterator DesktopIconListIter;
@ -104,7 +104,7 @@ private:
GlobalIconSettings* gisett;
Fl_Menu_Button* dmenu;
edelib::MenuButton* dmenu;
Wallpaper* wallpaper;
edelib::EdbusConnection* dbus;