From dc70c318cc80b604d5ca8fea6b004b3effecacb7 Mon Sep 17 00:00:00 2001 From: K D Hedger Date: Tue, 9 Jan 2024 13:18:34 +0000 Subject: [PATCH] changes to docl/dockprefs see change logs --- LFSApplications/ChangeLog | 2 ++ LFSApplications/LFSApplications/src/lfsdockprefs.cpp | 12 ++++++++++-- LFSDock/ChangeLog | 2 ++ LFSDock/LFSDock/src/calendar.cpp | 3 ++- LFSDock/LFSDock/src/callbacks.cpp | 7 +++++++ LFSDock/LFSDock/src/callbacks.h | 2 +- LFSDock/LFSDock/src/clock.cpp | 2 +- LFSDock/LFSDock/src/desktopSwitcher.cpp | 2 +- LFSDock/LFSDock/src/globals.cpp | 9 ++++----- LFSDock/LFSDock/src/globals.h | 6 +++--- LFSDock/LFSDock/src/launchers.cpp | 6 +++--- LFSDock/LFSDock/src/main.cpp | 5 ++--- LFSToolKit/examples/RunExamples.cpp | 2 -- 13 files changed, 38 insertions(+), 22 deletions(-) diff --git a/LFSApplications/ChangeLog b/LFSApplications/ChangeLog index 5d4d762..d87d75d 100644 --- a/LFSApplications/ChangeLog +++ b/LFSApplications/ChangeLog @@ -1,4 +1,6 @@ 0.2.0 +Apply in dockprefs kills all docks. +Added option to set dock on dockprefs at start up. Added lfsdockprefs desktop file to install. Fixed missing prefs image. Set appnames. diff --git a/LFSApplications/LFSApplications/src/lfsdockprefs.cpp b/LFSApplications/LFSApplications/src/lfsdockprefs.cpp index b5bbfdc..4577f45 100644 --- a/LFSApplications/LFSApplications/src/lfsdockprefs.cpp +++ b/LFSApplications/LFSApplications/src/lfsdockprefs.cpp @@ -78,7 +78,7 @@ LFSTK_lineEditClass *dockNameEdit=NULL; infoDataStruct **dockNames=NULL; LFSTK_menuClass *dockMenu=NULL; int dockCnt=0; -std::string dockName; +std::string dockName=""; bool doQuit(void *p,void* ud) { @@ -184,6 +184,7 @@ bool applyCB(void *p,void* ud) prefsfile=apc->configDir+"/"+dockName; prefs.LFSTK_saveVarsToFile(prefsfile.c_str()); //prefs.LFSTK_saveVarsToFile("-"); + system("killall lfsdock"); } return(true); } @@ -259,6 +260,7 @@ int main(int argc, char **argv) option longOptions[]= { {"window",1,0,'w'}, + {"dock",1,0,'d'}, {"help",0,0,'h'}, {0, 0, 0, 0} }; @@ -279,6 +281,9 @@ int main(int argc, char **argv) case 'w': parentWindow=atoi(optarg); break; + case 'd': + dockName=optarg; + break; } } @@ -315,7 +320,10 @@ int main(int argc, char **argv) //dock config //select - dockName="lfsdock-MAINDOCK.rc"; + if(dockName.length()==0) + dockName="lfsdock-MAINDOCK.rc"; + else + dockName="lfsdock-"+dockName+".rc"; selectDock=new LFSTK_buttonClass(wc,"Dock Config",BORDER,sy,GADGETWIDTH,GADGETHITE,BUTTONGRAV); selectDock->LFSTK_setIndicator(DISCLOSURE); diff --git a/LFSDock/ChangeLog b/LFSDock/ChangeLog index 433981f..9859828 100644 --- a/LFSDock/ChangeLog +++ b/LFSDock/ChangeLog @@ -1,4 +1,6 @@ 0.2.0 +Added run prefs for dock to launcher popup menu. +Code clean. Fixed current date highlight for single digit. Fixed seg fault when not using launchers. Fixed mem leak. diff --git a/LFSDock/LFSDock/src/calendar.cpp b/LFSDock/LFSDock/src/calendar.cpp index 10aa25e..40378b4 100644 --- a/LFSDock/LFSDock/src/calendar.cpp +++ b/LFSDock/LFSDock/src/calendar.cpp @@ -229,7 +229,8 @@ int addCalendar(int x,int y,int grav) editbox->LFSTK_setIgnores(false,false); editbox->LFSTK_addHighLights(dx,dy,dl,datesHilite[0]); //TODO// -// editbox->LFSTK_setGadgetColourPair(NORMALCOLOUR,"#40ffffff","black"); +// editbox->LFSTK_setGadgetColourPair(NORMALCOLOUR,dockBGColour,dockTextColour); +//editbox->LFSTK_setAlpha(1.0); //editbox->LFSTK_setTile(NULL,0); //calWindow->LFSTK_setTile(NULL,0); // calWindow->LFSTK_setWindowColourName(NORMALCOLOUR,"#40ffffff"); diff --git a/LFSDock/LFSDock/src/callbacks.cpp b/LFSDock/LFSDock/src/callbacks.cpp index b822bee..aaa64a3 100644 --- a/LFSDock/LFSDock/src/callbacks.cpp +++ b/LFSDock/LFSDock/src/callbacks.cpp @@ -146,6 +146,13 @@ bool contextCB(void *p,void* ud) apc->exitValue=0; apc->mainLoop=false; break; + case BUTTONPREFS: + { + std::string com; + com="lfsdockprefs -d "+whatDock+" &"; + system(com.c_str()); + } + break; } launcherExitCB(lwc->popupFromGadget,ud); diff --git a/LFSDock/LFSDock/src/callbacks.h b/LFSDock/LFSDock/src/callbacks.h index 77d0e16..5eed9bc 100644 --- a/LFSDock/LFSDock/src/callbacks.h +++ b/LFSDock/LFSDock/src/callbacks.h @@ -21,7 +21,7 @@ #ifndef _CALLBACKS_ #define _CALLBACKS_ -enum {BUTTONLAUNCH=0,BUTTONREMOVE,BUTTONTBD1,BUTTONTBD2,NOMOREBUTONS}; +enum {BUTTONLAUNCH=0,BUTTONREMOVE,BUTTONPREFS,BUTTONTBD2,NOMOREBUTONS}; extern LFSTK_windowClass *launcherContextWindow; extern LFSTK_windowClass *taskContextWindow; diff --git a/LFSDock/LFSDock/src/clock.cpp b/LFSDock/LFSDock/src/clock.cpp index 258c41a..9e68a39 100644 --- a/LFSDock/LFSDock/src/clock.cpp +++ b/LFSDock/LFSDock/src/clock.cpp @@ -50,7 +50,7 @@ int addClock(int x,int y,int grav) clockButton->LFSTK_setFontString(prefs.LFSTK_getCString(prefs.LFSTK_hashFromKey("font")),true); clockButton->LFSTK_setIgnores(false,false); clockButton->LFSTK_setTile(NULL,0); - clockButton->LFSTK_setLabelAutoColour(true); + //clockButton->LFSTK_setLabelAutoColour(true); clockButton->LFSTK_setGadgetColourPair(NORMALCOLOUR,dockBGColour,dockTextColour); clockButton->LFSTK_setStyle(BEVELNONE); diff --git a/LFSDock/LFSDock/src/desktopSwitcher.cpp b/LFSDock/LFSDock/src/desktopSwitcher.cpp index 91aabc5..3163f5e 100644 --- a/LFSDock/LFSDock/src/desktopSwitcher.cpp +++ b/LFSDock/LFSDock/src/desktopSwitcher.cpp @@ -127,7 +127,7 @@ int addDesktopSwitcer(int x,int y,int grav) deskLabel->LFSTK_setFontString(prefs.LFSTK_getCString(prefs.LFSTK_hashFromKey("font")),true); deskLabel->LFSTK_setIgnores(false,false); deskLabel->LFSTK_setTile(NULL,0); - deskLabel->LFSTK_setLabelAutoColour(true); + //deskLabel->LFSTK_setLabelAutoColour(true); deskLabel->LFSTK_setGadgetColourPair(NORMALCOLOUR,dockBGColour,dockTextColour); deskLabel->LFSTK_setStyle(BEVELNONE); diff --git a/LFSDock/LFSDock/src/globals.cpp b/LFSDock/LFSDock/src/globals.cpp index b2dcca0..8e1733d 100644 --- a/LFSDock/LFSDock/src/globals.cpp +++ b/LFSDock/LFSDock/src/globals.cpp @@ -38,13 +38,13 @@ int dockSize=2; const monitorStruct *mons=NULL; int onMonitor=0; int dockGravity=PANELSOUTH; -const char *dockTextColour=""; -const char *dockBGColour=""; +std::string dockTextColour=""; +std::string dockBGColour=""; int queueID; msgBuffer buffer; -const char *desktopTheme=NULL; +std::string desktopTheme; bool realMainLoop=true; int refreshRate=500000; @@ -99,7 +99,6 @@ void dropDesktopFile(const char *data,void *launcher)//TODO// std::string line; while(std::getline(stream,line)) { - //cleanstr=apc->globalLib->LFSTK_cleanString((const char*)line.c_str());//TODO// cleanstr=strdup(apc->globalLib->LFSTK_cleanString(line).c_str()); if((strrchr(cleanstr,'.')!=NULL) && (strcmp(strrchr(cleanstr,'.'),".desktop")==0))//TODO// { @@ -334,7 +333,7 @@ void moveDock(int extra) std::string getWindowName(Window winid) { propReturn pr; - char *wname; + char *wname=NULL; Status st; std::string returnval="???"; diff --git a/LFSDock/LFSDock/src/globals.h b/LFSDock/LFSDock/src/globals.h index 27c9356..da0baef 100644 --- a/LFSDock/LFSDock/src/globals.h +++ b/LFSDock/LFSDock/src/globals.h @@ -89,15 +89,15 @@ extern int dockSize; extern const monitorStruct *mons; extern int onMonitor; extern int dockGravity; -extern const char *dockTextColour; -extern const char *dockBGColour; +extern std::string dockTextColour; +extern std::string dockBGColour; extern int queueID; extern msgBuffer buffer; extern bool realMainLoop; -extern const char *desktopTheme; +extern std::string desktopTheme; extern int refreshRate; extern bool useMicros; diff --git a/LFSDock/LFSDock/src/launchers.cpp b/LFSDock/LFSDock/src/launchers.cpp index 44e1dfa..2c4af48 100644 --- a/LFSDock/LFSDock/src/launchers.cpp +++ b/LFSDock/LFSDock/src/launchers.cpp @@ -24,8 +24,8 @@ #include "launchers.h" LFSTK_buttonClass *contextButtons[NOMOREBUTONS]; -const char *contextLabelData[]={"Launch","Remove From Dock","TBD","TBD",NULL}; -const char *contextThemeIconData[]={"media-playback-start","list-remove","dialog-warning","dialog-warning"}; +const char *contextLabelData[]={"Launch","Remove From Dock","Run Prefs","TBD",NULL}; +const char *contextThemeIconData[]={"media-playback-start","list-remove","LFSTKPrefs","dialog-warning"}; std::vector launchersArray; LFSTK_findClass *findlaunchers=NULL; @@ -258,7 +258,7 @@ int addLaunchers(int x,int y,int grav) bc->LFSTK_setGadgetDropCallBack(gadgetDrop,USERDATA(l)); bc->LFSTK_setMouseMoveCallBack(launcherEnterCB,launcherExitCB,USERDATA(l)); bc->gadgetAcceptsDnD=true; - if((entry.icon!=NULL) && (desktopTheme!=NULL)) + if((entry.icon!=NULL) && (desktopTheme.length()>0)) icon=apc->globalLib->LFSTK_findThemedIcon(desktopTheme,entry.icon,""); if(icon.length()>0) bc->LFSTK_setImageFromPath(icon,LEFT,true); diff --git a/LFSDock/LFSDock/src/main.cpp b/LFSDock/LFSDock/src/main.cpp index 768b41e..b8ca4de 100644 --- a/LFSDock/LFSDock/src/main.cpp +++ b/LFSDock/LFSDock/src/main.cpp @@ -37,8 +37,8 @@ void loadPrefs(std::string prefsfile) dockSize=prefs.LFSTK_getInt(prefs.LFSTK_hashFromKey("docksize")); onMonitor=prefs.LFSTK_getInt(prefs.LFSTK_hashFromKey("onmonitor")); dockGravity=prefs.LFSTK_getInt(prefs.LFSTK_hashFromKey("dockgrav")); - dockTextColour=prefs.LFSTK_getCString(prefs.LFSTK_hashFromKey("textcolour")); - dockBGColour=prefs.LFSTK_getCString(prefs.LFSTK_hashFromKey("dockbgcolour")); + dockTextColour=prefs.LFSTK_getString(prefs.LFSTK_hashFromKey("textcolour")); + dockBGColour=prefs.LFSTK_getString(prefs.LFSTK_hashFromKey("dockbgcolour")); refreshRate= prefs.LFSTK_getInt(prefs.LFSTK_hashFromKey("refreshrate")); useMicros=prefs.LFSTK_getBool(prefs.LFSTK_hashFromKey("usemicroseconds")); } @@ -186,7 +186,6 @@ void sanityCheck(void) int main(int argc,char **argv) { - //char *env; std::string env; int psize; int key=666; diff --git a/LFSToolKit/examples/RunExamples.cpp b/LFSToolKit/examples/RunExamples.cpp index dae345b..5a19df3 100755 --- a/LFSToolKit/examples/RunExamples.cpp +++ b/LFSToolKit/examples/RunExamples.cpp @@ -273,8 +273,6 @@ int main(int argc, char **argv) sy+=YSPACING+14; wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true); - //wc->LFSTK_showWindow(); - //wc->LFSTK_setKeepAbove(true); printf("Number of gadgets in window=%i\n",wc->LFSTK_gadgetCount()); int retval=apc->LFSTK_runApp();