mirror of
https://github.com/edeproject/ede.git
synced 2023-08-10 21:13:03 +03:00
Merged changed pkg.m4 from edelib
ede-panel has alternative way of calling ede-about dialog Dumped SettingsApplicator.* code from evoke. They are replaced with ede-settings-apply script which should call all programs that needs to apply stored settings. This will reduce code entropy evoke will call ede-settings-apply at the startup ede-bell-conf modified to use "--apply" arg and to apply known settings ede-desktop will start icon exec path via ede-launch Fixed freebsd specific code in ede-panel's battery code
This commit is contained in:
@@ -27,22 +27,10 @@
|
||||
#include <edelib/Window.h>
|
||||
#include <edelib/MessageBox.h>
|
||||
#include <edelib/Run.h>
|
||||
#include <edelib/File.h>
|
||||
|
||||
typedef edelib::list<edelib::String> StrList;
|
||||
typedef edelib::list<edelib::String>::iterator StrListIter;
|
||||
|
||||
static bool file_can_execute(const edelib::String& f) {
|
||||
if(edelib::file_executable(f.c_str()))
|
||||
return true;
|
||||
|
||||
/* find full path then */
|
||||
edelib::String fp = edelib::file_path(f.c_str());
|
||||
if(fp.empty())
|
||||
return false;
|
||||
return edelib::file_executable(fp.c_str());
|
||||
}
|
||||
|
||||
class ControlButton : public Fl_Button {
|
||||
private:
|
||||
Fl_Box* tipbox;
|
||||
@@ -81,10 +69,8 @@ int ControlButton::handle(int event) {
|
||||
if(Fl::event_clicks()) {
|
||||
if(exec.empty())
|
||||
edelib::alert(_("Unable to execute command for '%s'. Command value is not set"), label());
|
||||
else if(!file_can_execute(exec.c_str()))
|
||||
edelib::alert(_("Unable to run program '%s'. Program not found"), exec.c_str());
|
||||
else
|
||||
edelib::run_async(exec.c_str());
|
||||
edelib::run_async("ede-launch %s", exec.c_str());
|
||||
}
|
||||
return 1;
|
||||
|
||||
|
Reference in New Issue
Block a user