File E-Notes-0.4.dif of Package WindowMaker-applets
--- Makefile
+++ Makefile
@@ -9,10 +9,10 @@
INCLUDE= -I/usr/include `gtk-config --cflags` `imlib-config --cflags`
EPPLET_LDFLAGS= -L/usr/X11R6/lib -L./lib -L/usr/lib -lepplet `gtk-config --libs` `imlib-config --libs` -lXpm
DOCKAPP_LDFLAGS= -L/usr/X11R6/lib -L./lib -L/usr/lib `gtk-config --libs` `imlib-config --libs` -lXpm
-CFLAGS = -O3 -Wall $(INCLUDE)
+CFLAGS = -O3 -Wall
SOURCES = main.cpp Notes.cpp
-EPPLET_CC=g++ $(CFLAGS) -DEPPLET
-DOCKAPP_CC=g++ $(CFLAGS)
+EPPLET_CC=g++ $(CFLAGS) $(INCLUDE) -DEPPLET
+DOCKAPP_CC=g++ $(CFLAGS) $(INCLUDE)
EPPLET_OBJS = .epplet/main.o .epplet/Notes.o
DOCKAPP_OBJS = .dockapp/main.o .dockapp/Notes.o
@@ -25,11 +25,9 @@
epplet: .epplet $(EPPLET_OBJS)
$(EPPLET_CC) -DEPPLET $(EPPLET_OBJS) $(EPPLET_LDFLAGS) -o E-Notes
- strip E-Notes
dockapp: .dockapp $(DOCKAPP_OBJS)
$(DOCKAPP_CC) $(DOCKAPP_OBJS) $(DOCKAPP_LDFLAGS) -o E-Notes
- strip E-Notes
.epplet/main.o: main.cpp main.h mask.xpm fancy.xpm backgd.xpm text.xpm
$(EPPLET_CC) -c main.cpp -o $@
--- main.cpp
+++ main.cpp
@@ -51,9 +51,9 @@
}
void query_config(char *field, char *buf, char *dflt) {
-char str[1024],tmp[1024],c;
+char str[1024],tmp[1024];
FILE *f;
-int not_found = 0;
+int not_found = 0,c;
char rcfile[1024];
//get rc filename
@@ -130,24 +130,24 @@
for (int i=0;i<nb_of_notes;i++) {
- if (!i) iterator = notes.begin();
- else iterator++;
- fprintf(f,"NOTE%d_BORDER %d\n",i,iterator.node->data->Get_Border());
- fprintf(f,"NOTE%d_ANGLE %d\n",i,iterator.node->data->Get_Angle());
- fprintf(f,"NOTE%d_STICKY %d\n",i,iterator.node->data->Get_Sticky());
- fprintf(f,"NOTE%d_ONTOP %d\n",i,iterator.node->data->Get_Ontop());
- fprintf(f,"NOTE%d_ALARM %s\n",i,iterator.node->data->Get_Alarm());
- fprintf(f,"NOTE%d_TRANSPARENT %d\n",i,iterator.node->data->Get_Transparent());
- fprintf(f,"NOTE%d_DESKTOPBACKGD %d\n",i,iterator.node->data->Get_DesktopBackgd());
- fprintf(f,"NOTE%d_SHADE %d\n",i,iterator.node->data->Get_Shade());
- fprintf(f,"NOTE%d_PADDINGX %d\n",i,iterator.node->data->Get_XPadding());
- fprintf(f,"NOTE%d_PADDINGY %d\n",i,iterator.node->data->Get_YPadding());
- fprintf(f,"NOTE%d_FONTNAME %s\n",i,iterator.node->data->Get_FontName());
- fprintf(f,"NOTE%d_FOREGDCOLOR %s\n",i,iterator.node->data->Get_TextColor());
- fprintf(f,"NOTE%d_BACKGDCOLOR %s\n",i,iterator.node->data->Get_BackgdColor());
- fprintf(f,"NOTE%d_TITLE %s\n",i,iterator.node->data->Get_Title());
- if (iterator.node->data->Get_Text()[strlen((default_note.text))-1]=='\n') fprintf(f,"NOTE%d_TEXT\n%sEND_TEX\n",i,iterator.node->data->Get_Text());
- else fprintf(f,"NOTE%d_TEXT\n%s\nEND_TEX\n",i,iterator.node->data->Get_Text());
+ if (!i) main_iterator = notes.begin();
+ else main_iterator++;
+ fprintf(f,"NOTE%d_BORDER %d\n",i,(*main_iterator)->Get_Border());
+ fprintf(f,"NOTE%d_ANGLE %d\n",i,(*main_iterator)->Get_Angle());
+ fprintf(f,"NOTE%d_STICKY %d\n",i,(*main_iterator)->Get_Sticky());
+ fprintf(f,"NOTE%d_ONTOP %d\n",i,(*main_iterator)->Get_Ontop());
+ fprintf(f,"NOTE%d_ALARM %s\n",i,(*main_iterator)->Get_Alarm());
+ fprintf(f,"NOTE%d_TRANSPARENT %d\n",i,(*main_iterator)->Get_Transparent());
+ fprintf(f,"NOTE%d_DESKTOPBACKGD %d\n",i,(*main_iterator)->Get_DesktopBackgd());
+ fprintf(f,"NOTE%d_SHADE %d\n",i,(*main_iterator)->Get_Shade());
+ fprintf(f,"NOTE%d_PADDINGX %d\n",i,(*main_iterator)->Get_XPadding());
+ fprintf(f,"NOTE%d_PADDINGY %d\n",i,(*main_iterator)->Get_YPadding());
+ fprintf(f,"NOTE%d_FONTNAME %s\n",i,(*main_iterator)->Get_FontName());
+ fprintf(f,"NOTE%d_FOREGDCOLOR %s\n",i,(*main_iterator)->Get_TextColor());
+ fprintf(f,"NOTE%d_BACKGDCOLOR %s\n",i,(*main_iterator)->Get_BackgdColor());
+ fprintf(f,"NOTE%d_TITLE %s\n",i,(*main_iterator)->Get_Title());
+ if ((*main_iterator)->Get_Text()[strlen((default_note.text))-1]=='\n') fprintf(f,"NOTE%d_TEXT\n%sEND_TEX\n",i,(*main_iterator)->Get_Text());
+ else fprintf(f,"NOTE%d_TEXT\n%s\nEND_TEX\n",i,(*main_iterator)->Get_Text());
}
fclose(f);
return;
@@ -179,73 +179,73 @@
#ifdef DEBUG
printf("Default note loaded%d\n",nb_of_notes);
-#endif:
+#endif
for (int i=0;i<nb_of_notes;i++) {
notes.push_back(new CNotes());
- if (!i) iterator = notes.begin();
- else iterator++;
+ if (!i) main_iterator = notes.begin();
+ else main_iterator++;
//Angle
sprintf(field_name,"NOTE%d_ANGLE",i);
query_config(field_name,buf,DEFAULT_ANGLE);
- iterator.node->data->Set_Angle(atoi(buf));
+ (*main_iterator)->Set_Angle(atoi(buf));
//Sticky
sprintf(field_name,"NOTE%d_STICKY",i);
query_config(field_name,buf,DEFAULT_STICKY);
- iterator.node->data->Set_Sticky(atoi(buf));
+ (*main_iterator)->Set_Sticky(atoi(buf));
//Ontop
sprintf(field_name,"NOTE%d_ONTOP",i);
query_config(field_name,buf,DEFAULT_ONTOP);
- iterator.node->data->Set_Ontop(atoi(buf));
+ (*main_iterator)->Set_Ontop(atoi(buf));
//border
sprintf(field_name,"NOTE%d_BORDER",i);
query_config(field_name,buf,DEFAULT_BORDER);
- iterator.node->data->Set_Border(atoi(buf));
+ (*main_iterator)->Set_Border(atoi(buf));
//Alarm
sprintf(field_name,"NOTE%d_ALARM",i);
query_config(field_name,buf,DEFAULT_ALARM);
- iterator.node->data->Set_Alarm(buf);
+ (*main_iterator)->Set_Alarm(buf);
//Transparent
sprintf(field_name,"NOTE%d_TRANSPARENT",i);
query_config(field_name,buf,DEFAULT_TRANSPARENT);
- iterator.node->data->Set_Transparent(atoi(buf));
+ (*main_iterator)->Set_Transparent(atoi(buf));
//DesktopBackgd
sprintf(field_name,"NOTE%d_DESKTOPBACKGD",i);
query_config(field_name,buf,DEFAULT_DESKTOPBACKGD);
- iterator.node->data->Set_DesktopBackgd(atoi(buf));
+ (*main_iterator)->Set_DesktopBackgd(atoi(buf));
//Shade
sprintf(field_name,"NOTE%d_SHADE",i);
query_config(field_name,buf,DEFAULT_SHADE);
- iterator.node->data->Set_Shade(atoi(buf));
+ (*main_iterator)->Set_Shade(atoi(buf));
//PaddingX
sprintf(field_name,"NOTE%d_PADDINGX",i);
query_config(field_name,buf,DEFAULT_PADDINGX);
- iterator.node->data->Set_XPadding(atoi(buf));
+ (*main_iterator)->Set_XPadding(atoi(buf));
//PaddingY
sprintf(field_name,"NOTE%d_PADDINGY",i);
query_config(field_name,buf,DEFAULT_PADDINGY);
- iterator.node->data->Set_YPadding(atoi(buf));
+ (*main_iterator)->Set_YPadding(atoi(buf));
//Title
sprintf(field_name,"NOTE%d_TITLE",i);
query_config(field_name,buf,DEFAULT_TITLE);
- iterator.node->data->Set_Title(buf);
+ (*main_iterator)->Set_Title(buf);
//TextColor
sprintf(field_name,"NOTE%d_FOREGDCOLOR",i);
query_config(field_name,buf,DEFAULT_FOREGDCOLOR);
- iterator.node->data->Set_TextColor(buf);
+ (*main_iterator)->Set_TextColor(buf);
//BackgdColor
sprintf(field_name,"NOTE%d_BACKGDCOLOR",i);
query_config(field_name,buf,DEFAULT_BACKGDCOLOR);
- iterator.node->data->Set_BackgdColor(buf);
+ (*main_iterator)->Set_BackgdColor(buf);
//FontName
sprintf(field_name,"NOTE%d_FONTNAME",i);
query_config(field_name,buf,DEFAULT_FONTNAME);
- iterator.node->data->Set_FontName(buf);
+ (*main_iterator)->Set_FontName(buf);
//Text
sprintf(field_name,"NOTE%d_TEXT",i);
query_config(field_name,buf,DEFAULT_TEXT);
- iterator.node->data->Set_Text(buf);
- iterator.node->data->Build_Note();
+ (*main_iterator)->Set_Text(buf);
+ (*main_iterator)->Build_Note();
#ifdef DEBUG
printf("Note #%d loaded\n",i);
#endif
@@ -492,10 +492,10 @@
}
}
//taking care of refreshing the notes.........................
- iterator = notes.begin();
+ main_iterator = notes.begin();
for (int i=0;i<nb_of_notes;i++) {
//check alarm...
- sscanf(iterator.node->data->Get_Alarm(),"at %d:%d on %d/%d/%d every %d days",&my_time.tm_hour,&my_time.tm_min,&my_time.tm_mon,&my_time.tm_mday,&my_time.tm_year,&rep);
+ sscanf((*main_iterator)->Get_Alarm(),"at %d:%d on %d/%d/%d every %d days",&my_time.tm_hour,&my_time.tm_min,&my_time.tm_mon,&my_time.tm_mday,&my_time.tm_year,&rep);
my_time.tm_sec=0;
my_time.tm_mon--;
my_time.tm_year-=1900;
@@ -508,26 +508,26 @@
time_seconds+=60*60*24*rep;
new_time = localtime(&time_seconds);
sprintf(buf,"at %d:%d on %d/%d/%d every %d days",new_time->tm_hour,new_time->tm_min,new_time->tm_mon+1,new_time->tm_mday,new_time->tm_year+1900,rep);
- iterator.node->data->Set_Alarm(buf);
+ (*main_iterator)->Set_Alarm(buf);
}
}
//Let's wake the user up for 2 secs. ;)
else if ((tv.tv_sec-time_seconds)>0 && (tv.tv_sec-time_seconds)<2) {
- iterator.node->data->Set_Position(0,0);
+ (*main_iterator)->Set_Position(0,0);
XBell(maindisp,100);
}
//check if root win backgd update needed
- if (iterator.node->data->Get_DesktopBackgd() && !iterator.node->data->Get_Transparent()) iterator.node->data->Watch_Window_Move();
+ if ((*main_iterator)->Get_DesktopBackgd() && !(*main_iterator)->Get_Transparent()) (*main_iterator)->Watch_Window_Move();
- while (XPending(iterator.node->data->Get_Display())) {
- XNextEvent(iterator.node->data->Get_Display(), &ev);
+ while (XPending((*main_iterator)->Get_Display())) {
+ XNextEvent((*main_iterator)->Get_Display(), &ev);
switch (ev.type) {
case Expose:{
- iterator.node->data->Refresh_Note(ev.xexpose.x, ev.xexpose.y, ev.xexpose.width, ev.xexpose.height);
+ (*main_iterator)->Refresh_Note(ev.xexpose.x, ev.xexpose.y, ev.xexpose.width, ev.xexpose.height);
}break;
case ButtonPress:{
//create the configuration window...
- selected_iterator = iterator;
+ selected_iterator = main_iterator;
if (ev.xbutton.button==1) {
#ifdef CONFIG_WIN
Display_Config();
@@ -537,14 +537,14 @@
if (ev.xbutton.button==3) {
delete_note();
i = nb_of_notes;
- //iterator++;
+ //main_iterator++;
}
}break;
case MotionNotify:{
}break;
}
}
- iterator++;
+ main_iterator++;
}
#ifndef CONFIG_WIN
//Sleeping a bit..........................................
@@ -566,23 +566,23 @@
printf("Creating note number %d\n",nb_of_notes);
#endif
notes.push_back(new CNotes());
-iterator = notes.end();iterator--;
-iterator.node->data->Set_Title(default_note.title);
-iterator.node->data->Set_FontName(default_note.fontName);
-iterator.node->data->Set_Transparent(default_note.transparent);
-iterator.node->data->Set_DesktopBackgd(default_note.desktopBackgd);
-iterator.node->data->Set_Shade(default_note.shade);
-iterator.node->data->Set_Angle(default_note.angle);
-iterator.node->data->Set_Sticky(default_note.sticky);
-iterator.node->data->Set_Ontop(default_note.ontop);
-iterator.node->data->Set_Alarm(default_note.alarm);
-iterator.node->data->Set_Border(default_note.border);
-iterator.node->data->Set_XPadding(default_note.paddingX);
-iterator.node->data->Set_YPadding(default_note.paddingY);
-iterator.node->data->Set_TextColor(default_note.textColor);
-iterator.node->data->Set_BackgdColor(default_note.backgdColor);
-iterator.node->data->Set_Text(default_note.text);
-iterator.node->data->Build_Note();
+main_iterator = notes.end();main_iterator--;
+(*main_iterator)->Set_Title(default_note.title);
+(*main_iterator)->Set_FontName(default_note.fontName);
+(*main_iterator)->Set_Transparent(default_note.transparent);
+(*main_iterator)->Set_DesktopBackgd(default_note.desktopBackgd);
+(*main_iterator)->Set_Shade(default_note.shade);
+(*main_iterator)->Set_Angle(default_note.angle);
+(*main_iterator)->Set_Sticky(default_note.sticky);
+(*main_iterator)->Set_Ontop(default_note.ontop);
+(*main_iterator)->Set_Alarm(default_note.alarm);
+(*main_iterator)->Set_Border(default_note.border);
+(*main_iterator)->Set_XPadding(default_note.paddingX);
+(*main_iterator)->Set_YPadding(default_note.paddingY);
+(*main_iterator)->Set_TextColor(default_note.textColor);
+(*main_iterator)->Set_BackgdColor(default_note.backgdColor);
+(*main_iterator)->Set_Text(default_note.text);
+(*main_iterator)->Build_Note();
nb_of_notes++;
}
@@ -592,7 +592,7 @@
*/
void delete_note(void) {
- delete selected_iterator.node->data;
+ delete (*selected_iterator);
notes.erase(selected_iterator);
nb_of_notes--;
#ifdef DEBUG
@@ -979,35 +979,35 @@
//configuring a Note...
if (selected_iterator!=notes.end()) {
//title
- gtk_entry_set_text (GTK_ENTRY(config_window.title_tf), selected_iterator.node->data->Get_Title());
+ gtk_entry_set_text (GTK_ENTRY(config_window.title_tf), (*selected_iterator)->Get_Title());
//fancy
- if (selected_iterator.node->data->Get_Border()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.border_cb),TRUE);
+ if ((*selected_iterator)->Get_Border()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.border_cb),TRUE);
else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.border_cb),FALSE);
- if (selected_iterator.node->data->Get_Sticky()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.sticky_cb),TRUE);
+ if ((*selected_iterator)->Get_Sticky()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.sticky_cb),TRUE);
else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.sticky_cb),FALSE);
- if (selected_iterator.node->data->Get_Ontop()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.ontop_cb),TRUE);
+ if ((*selected_iterator)->Get_Ontop()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.ontop_cb),TRUE);
else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.ontop_cb),FALSE);
- gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(config_window.angle_sc)), selected_iterator.node->data->Get_Angle());
- gtk_entry_set_text (GTK_ENTRY(config_window.alarm_tf), selected_iterator.node->data->Get_Alarm());
+ gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(config_window.angle_sc)), (*selected_iterator)->Get_Angle());
+ gtk_entry_set_text (GTK_ENTRY(config_window.alarm_tf), (*selected_iterator)->Get_Alarm());
gtk_entry_set_position(GTK_ENTRY(config_window.alarm_tf),0);
//backgd
- gtk_entry_set_text (GTK_ENTRY(config_window.backgd_tf), selected_iterator.node->data->Get_BackgdColor());
- if (selected_iterator.node->data->Get_Transparent()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.transparent_cb),TRUE);
+ gtk_entry_set_text (GTK_ENTRY(config_window.backgd_tf), (*selected_iterator)->Get_BackgdColor());
+ if ((*selected_iterator)->Get_Transparent()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.transparent_cb),TRUE);
else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.transparent_cb),FALSE);
- if (selected_iterator.node->data->Get_DesktopBackgd()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.desktopbg_cb),TRUE);
+ if ((*selected_iterator)->Get_DesktopBackgd()) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.desktopbg_cb),TRUE);
else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_window.desktopbg_cb),FALSE);
- gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(config_window.shade_sc)), selected_iterator.node->data->Get_Shade());
+ gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(config_window.shade_sc)), (*selected_iterator)->Get_Shade());
//text
- gtk_entry_set_text (GTK_ENTRY(config_window.textColor_tf), selected_iterator.node->data->Get_TextColor());
- gtk_label_set_text (GTK_LABEL(config_window.font_label), selected_iterator.node->data->Get_FontName());
- sprintf(buf,"%d",selected_iterator.node->data->Get_XPadding());
+ gtk_entry_set_text (GTK_ENTRY(config_window.textColor_tf), (*selected_iterator)->Get_TextColor());
+ gtk_label_set_text (GTK_LABEL(config_window.font_label), (*selected_iterator)->Get_FontName());
+ sprintf(buf,"%d",(*selected_iterator)->Get_XPadding());
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(config_window.xPadding_combo)->entry),buf);
- sprintf(buf,"%d",selected_iterator.node->data->Get_YPadding());
+ sprintf(buf,"%d",(*selected_iterator)->Get_YPadding());
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(config_window.yPadding_combo)->entry),buf);
//cleanup text area...
gtk_text_set_point(GTK_TEXT(config_window.text),gtk_text_get_length( GTK_TEXT(config_window.text)));
gtk_text_backward_delete(GTK_TEXT(config_window.text),gtk_text_get_length( GTK_TEXT(config_window.text)));
- gtk_text_insert (GTK_TEXT (config_window.text), NULL, NULL, NULL, selected_iterator.node->data->Get_Text(), -1);
+ gtk_text_insert (GTK_TEXT (config_window.text), NULL, NULL, NULL, (*selected_iterator)->Get_Text(), -1);
}
//configuring the defaults...
else {
@@ -1052,27 +1052,27 @@
printf("Flushing data...\n");
#endif
if (selected_iterator!=notes.end()) {
- selected_iterator.node->data->Set_Title(gtk_entry_get_text(GTK_ENTRY(config_window.title_tf)));
+ (*selected_iterator)->Set_Title(gtk_entry_get_text(GTK_ENTRY(config_window.title_tf)));
//fancy
- selected_iterator.node->data->Set_Sticky(GTK_TOGGLE_BUTTON(config_window.sticky_cb)->active);
- selected_iterator.node->data->Set_Ontop(GTK_TOGGLE_BUTTON(config_window.ontop_cb)->active);
- selected_iterator.node->data->Set_Border(GTK_TOGGLE_BUTTON(config_window.border_cb)->active);
- selected_iterator.node->data->Set_Angle((int)(gtk_range_get_adjustment(GTK_RANGE(config_window.angle_sc))->value));
- selected_iterator.node->data->Set_Alarm(gtk_entry_get_text(GTK_ENTRY(config_window.alarm_tf)));
+ (*selected_iterator)->Set_Sticky(GTK_TOGGLE_BUTTON(config_window.sticky_cb)->active);
+ (*selected_iterator)->Set_Ontop(GTK_TOGGLE_BUTTON(config_window.ontop_cb)->active);
+ (*selected_iterator)->Set_Border(GTK_TOGGLE_BUTTON(config_window.border_cb)->active);
+ (*selected_iterator)->Set_Angle((int)(gtk_range_get_adjustment(GTK_RANGE(config_window.angle_sc))->value));
+ (*selected_iterator)->Set_Alarm(gtk_entry_get_text(GTK_ENTRY(config_window.alarm_tf)));
//backgd
- selected_iterator.node->data->Set_Transparent(GTK_TOGGLE_BUTTON(config_window.transparent_cb)->active);
- selected_iterator.node->data->Set_DesktopBackgd(GTK_TOGGLE_BUTTON(config_window.desktopbg_cb)->active);
- selected_iterator.node->data->Set_Shade(gtk_range_get_adjustment(GTK_RANGE(config_window.shade_sc))->value);
- selected_iterator.node->data->Set_BackgdColor(gtk_entry_get_text(GTK_ENTRY(config_window.backgd_tf)));
+ (*selected_iterator)->Set_Transparent(GTK_TOGGLE_BUTTON(config_window.transparent_cb)->active);
+ (*selected_iterator)->Set_DesktopBackgd(GTK_TOGGLE_BUTTON(config_window.desktopbg_cb)->active);
+ (*selected_iterator)->Set_Shade(gtk_range_get_adjustment(GTK_RANGE(config_window.shade_sc))->value);
+ (*selected_iterator)->Set_BackgdColor(gtk_entry_get_text(GTK_ENTRY(config_window.backgd_tf)));
//text
- selected_iterator.node->data->Set_TextColor(gtk_entry_get_text(GTK_ENTRY(config_window.textColor_tf)));
+ (*selected_iterator)->Set_TextColor(gtk_entry_get_text(GTK_ENTRY(config_window.textColor_tf)));
gtk_label_get(GTK_LABEL(config_window.font_label),&buf);
- selected_iterator.node->data->Set_FontName(buf);
- selected_iterator.node->data->Set_XPadding(atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(config_window.xPadding_combo)->entry))));
- selected_iterator.node->data->Set_YPadding(atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(config_window.yPadding_combo)->entry))));
- selected_iterator.node->data->Set_Text(gtk_editable_get_chars( GTK_EDITABLE(config_window.text), 0, gtk_text_get_length( GTK_TEXT(config_window.text))));
+ (*selected_iterator)->Set_FontName(buf);
+ (*selected_iterator)->Set_XPadding(atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(config_window.xPadding_combo)->entry))));
+ (*selected_iterator)->Set_YPadding(atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(config_window.yPadding_combo)->entry))));
+ (*selected_iterator)->Set_Text(gtk_editable_get_chars( GTK_EDITABLE(config_window.text), 0, gtk_text_get_length( GTK_TEXT(config_window.text))));
- selected_iterator.node->data->Build_Note();
+ (*selected_iterator)->Build_Note();
}
//setting new defaults...
else {
--- main.h
+++ main.h
@@ -11,7 +11,10 @@
#define CONFIG_WIN
#define RCFILE ".ENotesrc"
+
+#ifndef HELPFILE
#define HELPFILE "/usr/local/doc/E-Notes/E-Notes_help.html"
+#endif
#ifdef EPPLET
extern "C" {
@@ -61,8 +64,8 @@
int nb_of_notes=0;
//CNotes *notes[MAX_NOTES]; //table of note Objects
-list<CNotes*> notes;
-list<CNotes*>::iterator iterator,selected_iterator;
+std::list<CNotes*> notes;
+std::list<CNotes*>::iterator main_iterator,selected_iterator;
DEFAULT_NOTE default_note;
Window mainwin;
