From: nicola Date: Tue, 8 Dec 2009 15:07:55 +0000 (+0100) Subject: bo X-Git-Url: http://git.maemo.org/git/?p=badge;a=commitdiff_plain;h=e51ac692dd2797487fa85e9f2552d96b258a6eb3 bo --- diff --git a/.gitignore b/.gitignore index ca5feb5..b51435b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,2 @@ -badgedata.o -badgewindow.o -dialogcalendar.o -dialogday.o -dialogsearch.o -main.o -moc_badgewindow.o -moc_dialogcalendar.o -moc_dialogday.o -moc_dialogsearch.o -timetable.o -Makefile -moc_badgewindow.cpp -moc_badgewindow.o -moc_dialogcalendar.cpp -moc_dialogcalendar.o -moc_dialogday.cpp -moc_dialogday.o -moc_dialogsearch.cpp -moc_dialogsearch.o -badge -badge.pro.user -ui_badgewindow.h -ui_dialogcalendar.h -ui_dialogday.h -ui_dialogsearch.h +www +WWW diff --git a/Makefile b/Makefile index ba1aefc..ef24b2a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: badge -# Generated by qmake (2.01a) (Qt 4.5.2) on: mar nov 24 13:12:25 2009 +# Generated by qmake (2.01a) (Qt 4.5.2) on: mar dic 8 14:26:05 2009 # Project: badge.pro # Template: app # Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile badge.pro @@ -43,10 +43,26 @@ OBJECTS_DIR = ./ ####### Files SOURCES = main.cpp \ - badgewindow.cpp moc_badgewindow.cpp + badgewindow.cpp \ + badgedata.cpp \ + timetable.cpp \ + dialogday.cpp \ + dialogsearch.cpp \ + dialogcalendar.cpp moc_badgewindow.cpp \ + moc_dialogday.cpp \ + moc_dialogsearch.cpp \ + moc_dialogcalendar.cpp OBJECTS = main.o \ badgewindow.o \ - moc_badgewindow.o + badgedata.o \ + timetable.o \ + dialogday.o \ + dialogsearch.o \ + dialogcalendar.o \ + moc_badgewindow.o \ + moc_dialogday.o \ + moc_dialogsearch.o \ + moc_dialogcalendar.o DIST = /usr/share/qt4/mkspecs/common/g++.conf \ /usr/share/qt4/mkspecs/common/unix.conf \ /usr/share/qt4/mkspecs/common/linux.conf \ @@ -95,7 +111,7 @@ first: all all: Makefile $(TARGET) -$(TARGET): ui_badgewindow.h $(OBJECTS) +$(TARGET): ui_badgewindow.h ui_dialogday.h ui_dialogsearch.h ui_dialogcalendar.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) Makefile: badge.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \ @@ -146,7 +162,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) .tmp/badge1.0.0 || $(MKDIR) .tmp/badge1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/badge1.0.0/ && $(COPY_FILE) --parents badgewindow.h .tmp/badge1.0.0/ && $(COPY_FILE) --parents main.cpp badgewindow.cpp .tmp/badge1.0.0/ && $(COPY_FILE) --parents badgewindow.ui .tmp/badge1.0.0/ && (cd `dirname .tmp/badge1.0.0` && $(TAR) badge1.0.0.tar badge1.0.0 && $(COMPRESS) badge1.0.0.tar) && $(MOVE) `dirname .tmp/badge1.0.0`/badge1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/badge1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/badge1.0.0/ && $(COPY_FILE) --parents badgewindow.h badgedata.h timetable.h dialogday.h dialogsearch.h dialogcalendar.h .tmp/badge1.0.0/ && $(COPY_FILE) --parents main.cpp badgewindow.cpp badgedata.cpp timetable.cpp dialogday.cpp dialogsearch.cpp dialogcalendar.cpp .tmp/badge1.0.0/ && $(COPY_FILE) --parents badgewindow.ui dialogday.ui dialogsearch.ui dialogcalendar.ui .tmp/badge1.0.0/ && (cd `dirname .tmp/badge1.0.0` && $(TAR) badge1.0.0.tar badge1.0.0 && $(COMPRESS) badge1.0.0.tar) && $(MOVE) `dirname .tmp/badge1.0.0`/badge1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/badge1.0.0 clean:compiler_clean @@ -165,12 +181,22 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: moc_badgewindow.cpp +compiler_moc_header_make_all: moc_badgewindow.cpp moc_dialogday.cpp moc_dialogsearch.cpp moc_dialogcalendar.cpp compiler_moc_header_clean: - -$(DEL_FILE) moc_badgewindow.cpp + -$(DEL_FILE) moc_badgewindow.cpp moc_dialogday.cpp moc_dialogsearch.cpp moc_dialogcalendar.cpp moc_badgewindow.cpp: badgewindow.h /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) badgewindow.h -o moc_badgewindow.cpp +moc_dialogday.cpp: timetable.h \ + dialogday.h + /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dialogday.h -o moc_dialogday.cpp + +moc_dialogsearch.cpp: dialogsearch.h + /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dialogsearch.h -o moc_dialogsearch.cpp + +moc_dialogcalendar.cpp: dialogcalendar.h + /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dialogcalendar.h -o moc_dialogcalendar.cpp + compiler_rcc_make_all: compiler_rcc_clean: compiler_image_collection_make_all: qmake_image_collection.cpp @@ -178,12 +204,21 @@ compiler_image_collection_clean: -$(DEL_FILE) qmake_image_collection.cpp compiler_moc_source_make_all: compiler_moc_source_clean: -compiler_uic_make_all: ui_badgewindow.h +compiler_uic_make_all: ui_badgewindow.h ui_dialogday.h ui_dialogsearch.h ui_dialogcalendar.h compiler_uic_clean: - -$(DEL_FILE) ui_badgewindow.h + -$(DEL_FILE) ui_badgewindow.h ui_dialogday.h ui_dialogsearch.h ui_dialogcalendar.h ui_badgewindow.h: badgewindow.ui /usr/bin/uic-qt4 badgewindow.ui -o ui_badgewindow.h +ui_dialogday.h: dialogday.ui + /usr/bin/uic-qt4 dialogday.ui -o ui_dialogday.h + +ui_dialogsearch.h: dialogsearch.ui + /usr/bin/uic-qt4 dialogsearch.ui -o ui_dialogsearch.h + +ui_dialogcalendar.h: dialogcalendar.ui + /usr/bin/uic-qt4 dialogcalendar.ui -o ui_dialogcalendar.h + compiler_yacc_decl_make_all: compiler_yacc_decl_clean: compiler_yacc_impl_make_all: @@ -198,12 +233,48 @@ main.o: main.cpp badgewindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp badgewindow.o: badgewindow.cpp badgewindow.h \ - ui_badgewindow.h + ui_badgewindow.h \ + dialogday.h \ + timetable.h \ + badgedata.h \ + dialogsearch.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o badgewindow.o badgewindow.cpp +badgedata.o: badgedata.cpp badgedata.h \ + timetable.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o badgedata.o badgedata.cpp + +timetable.o: timetable.cpp timetable.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o timetable.o timetable.cpp + +dialogday.o: dialogday.cpp dialogday.h \ + timetable.h \ + ui_dialogday.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dialogday.o dialogday.cpp + +dialogsearch.o: dialogsearch.cpp dialogsearch.h \ + ui_dialogsearch.h \ + dialogcalendar.h \ + badgedata.h \ + timetable.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dialogsearch.o dialogsearch.cpp + +dialogcalendar.o: dialogcalendar.cpp dialogcalendar.h \ + ui_dialogcalendar.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dialogcalendar.o dialogcalendar.cpp + moc_badgewindow.o: moc_badgewindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_badgewindow.o moc_badgewindow.cpp +moc_dialogday.o: moc_dialogday.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dialogday.o moc_dialogday.cpp + +moc_dialogsearch.o: moc_dialogsearch.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dialogsearch.o moc_dialogsearch.cpp + +moc_dialogcalendar.o: moc_dialogcalendar.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dialogcalendar.o moc_dialogcalendar.cpp + ####### Install install: FORCE diff --git a/badge.pro.user b/badge.pro.user index 1abec2c..b288cf5 100644 --- a/badge.pro.user +++ b/badge.pro.user @@ -21,10 +21,6 @@ false - RunConfiguration0-UserEnvironmentChanges - - - RunConfiguration0-UserSetName false @@ -45,6 +41,7 @@ Debug 0 + @@ -52,6 +49,7 @@ Release 0 + @@ -59,34 +57,45 @@ Debug - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-beC3moeOkk,guid=1f0b3d24e0c6a46d27ce5daf4b0b83fa - DESKTOP_SESSION=LXDE + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-bb8pUVMkq8,guid=cafc60c47a739e2654c6f3bf4b1e3417 + DESKTOP_SESSION=e16-kde DESKTOP_STARTUP_ID= - DISPLAY=:0 - GDMSESSION=LXDE - GDM_KEYBOARD_LAYOUT=it + DISPLAY=:0.0 + GDMSESSION=e16-kde GDM_LANG=it_IT.UTF-8 - GNOME_KEYRING_PID=1923 - GNOME_KEYRING_SOCKET=/tmp/keyring-ukCbPa/socket + GDM_XSERVER_LOCATION=local + GNOME_KEYRING_PID=4217 + GNOME_KEYRING_SOCKET=/tmp/keyring-pKP9wu/socket + GPG_AGENT_INFO=/tmp/gpg-Rd7xr7/S.gpg-agent:4286:1 + GS_LIB=/home/nicola/.fonts + GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/nicola/.gtkrc-2.0:/home/nicola/.gtkrc-2.0-kde4:/home/nicola/.kde/share/config/gtkrc-2.0 GTK_MODULES=canberra-gtk-module + GTK_RC_FILES=/etc/gtk/gtkrc:/home/nicola/.gtkrc::/home/nicola/.kde/share/config/gtkrc HOME=/home/nicola + KDEWM=e16 + KDE_FULL_SESSION=true + KDE_MULTIHEAD=false + KDE_SESSION_UID=1000 + KDE_SESSION_VERSION=4 LANG=it_IT.UTF-8 - LD_LIBRARY_PATH=/usr/lib/qtcreator: + LD_LIBRARY_PATH=/opt/qtsdk-2009.02/lib/qtcreator: + LIBGL_DRIVERS_PATH=/usr/lib/dri LOGNAME=nicola PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games - PWD=/home/nicola + PWD=/home/nicola/Documenti QTDIR=/usr - SAL_USE_VCLPLUGIN=gtk + QT_PLUGIN_PATH=/home/nicola/.kde/lib/kde4/plugins/:/usr/lib/kde4/plugins/ + SESSION_MANAGER=local/nicola-desktop:/tmp/.ICE-unix/4384 SHELL=/bin/bash - SSH_AGENT_PID=1997 - SSH_AUTH_SOCK=/tmp/ssh-sgZJMM1938/agent.1938 + SSH_AGENT_PID=4285 + SSH_AUTH_SOCK=/tmp/ssh-TNRhUi4230/agent.4230 USER=nicola USERNAME=nicola - XAUTHORITY=/var/run/gdm/auth-for-nicola-JAEtIA/database - XDG_CONFIG_HOME=/home/nicola/.config - XDG_MENU_PREFIX=lxde- - XDG_SESSION_COOKIE=c807bc4f4e5f683605c6609f4ad47ace-1259045881.49582-721013045 - _LXSESSION_PID=1938 + WINDOWPATH=7 + XAUTHORITY=/home/nicola/.Xauthority + XCURSOR_THEME=oxy-white + XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/ + XDG_SESSION_COOKIE=0e8387a0284c4a1226bd761e49f391b0-1260270613.914373-1130137809 /home/nicola/src/badge/badge.pro @@ -106,34 +115,45 @@ Debug - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-beC3moeOkk,guid=1f0b3d24e0c6a46d27ce5daf4b0b83fa - DESKTOP_SESSION=LXDE + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-bb8pUVMkq8,guid=cafc60c47a739e2654c6f3bf4b1e3417 + DESKTOP_SESSION=e16-kde DESKTOP_STARTUP_ID= - DISPLAY=:0 - GDMSESSION=LXDE - GDM_KEYBOARD_LAYOUT=it + DISPLAY=:0.0 + GDMSESSION=e16-kde GDM_LANG=it_IT.UTF-8 - GNOME_KEYRING_PID=1923 - GNOME_KEYRING_SOCKET=/tmp/keyring-ukCbPa/socket + GDM_XSERVER_LOCATION=local + GNOME_KEYRING_PID=4217 + GNOME_KEYRING_SOCKET=/tmp/keyring-pKP9wu/socket + GPG_AGENT_INFO=/tmp/gpg-Rd7xr7/S.gpg-agent:4286:1 + GS_LIB=/home/nicola/.fonts + GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/nicola/.gtkrc-2.0:/home/nicola/.gtkrc-2.0-kde4:/home/nicola/.kde/share/config/gtkrc-2.0 GTK_MODULES=canberra-gtk-module + GTK_RC_FILES=/etc/gtk/gtkrc:/home/nicola/.gtkrc::/home/nicola/.kde/share/config/gtkrc HOME=/home/nicola + KDEWM=e16 + KDE_FULL_SESSION=true + KDE_MULTIHEAD=false + KDE_SESSION_UID=1000 + KDE_SESSION_VERSION=4 LANG=it_IT.UTF-8 - LD_LIBRARY_PATH=/usr/lib/qtcreator: + LD_LIBRARY_PATH=/opt/qtsdk-2009.02/lib/qtcreator: + LIBGL_DRIVERS_PATH=/usr/lib/dri LOGNAME=nicola PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games - PWD=/home/nicola + PWD=/home/nicola/Documenti QTDIR=/usr - SAL_USE_VCLPLUGIN=gtk + QT_PLUGIN_PATH=/home/nicola/.kde/lib/kde4/plugins/:/usr/lib/kde4/plugins/ + SESSION_MANAGER=local/nicola-desktop:/tmp/.ICE-unix/4384 SHELL=/bin/bash - SSH_AGENT_PID=1997 - SSH_AUTH_SOCK=/tmp/ssh-sgZJMM1938/agent.1938 + SSH_AGENT_PID=4285 + SSH_AUTH_SOCK=/tmp/ssh-TNRhUi4230/agent.4230 USER=nicola USERNAME=nicola - XAUTHORITY=/var/run/gdm/auth-for-nicola-JAEtIA/database - XDG_CONFIG_HOME=/home/nicola/.config - XDG_MENU_PREFIX=lxde- - XDG_SESSION_COOKIE=c807bc4f4e5f683605c6609f4ad47ace-1259045881.49582-721013045 - _LXSESSION_PID=1938 + WINDOWPATH=7 + XAUTHORITY=/home/nicola/.Xauthority + XCURSOR_THEME=oxy-white + XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/ + XDG_SESSION_COOKIE=0e8387a0284c4a1226bd761e49f391b0-1260270613.914373-1130137809 -w diff --git a/dialogday.ui b/dialogday.ui index 8540e7b..b9a20d7 100644 --- a/dialogday.ui +++ b/dialogday.ui @@ -6,7 +6,7 @@ 0 0 - 350 + 319 236 @@ -15,26 +15,44 @@ - - - Entrance - - - - - - - - - - Exit - - - - - + + + + + Entrance + + + + + + + + 100 + 0 + + + + + + + + Exit + + + + + + + + 100 + 0 + + + + + - + First Pause @@ -42,34 +60,50 @@ - - - Begin - - + + + + + Begin + + + + + + + false + + + + 100 + 0 + + + + + + + + End + + + + + + + false + + + + 100 + 0 + + + + + - - - - false - - - - - - - End - - - - - - - false - - - - + Second Pause @@ -77,34 +111,50 @@ - - - Begin - - - - - - - false - - - - - - - End - - - - - - - false - - + + + + + Begin + + + + + + + false + + + + 100 + 0 + + + + + + + + End + + + + + + + false + + + + 100 + 0 + + + + + - + Qt::Horizontal