Changeset ea638ef for src/gui/gui.pro

Timestamp:

01/27/10 20:17:01 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

21d7cc0

Parents:

bc88043

Message:

implemented 'conflicts' dialog

• displays rooms instead of conflicts for now
  • needs to implement additional methods in Event, ...

File:

• src/gui/gui.pro (modified) (6 diffs)

src/gui/gui.pro

@@ -35 +35 @@
 # (which means they need to be added to the test module as well,
 # but I am sure you can live with that for the time being).
+
 FORMS += searchhead.ui \
     mainwindow.ui \
@@ -41 +42 @@
     about.ui \
     eventdialog.ui \
+    conflictsdialog.ui \
     tabcontainer.ui \
     mapwindow.ui
+
 HEADERS += roomstabcontainer.h \
     nowtabcontainer.h \
@@ -50 +53 @@
     searchhead.h \
     dayviewtabcontainer.h \
+    conflictdialogcontainer.h \
+    conflictsdialog.h \
     mainwindow.h \
     daynavigatorwidget.h \
@@ -57 +62 @@
     tabcontainer.h \
     mapwindow.h
+
 SOURCES += roomstabcontainer.cpp \
     nowtabcontainer.cpp \
@@ -64 +70 @@
     searchhead.cpp \
     dayviewtabcontainer.cpp \
+    conflictdialogcontainer.cpp \
+    conflictsdialog.cpp \
     mainwindow.cpp \
     daynavigatorwidget.cpp \
@@ -71 +79 @@
     tabcontainer.cpp \
     mapwindow.cpp
+
 maemo { 
-    FORMS += searchhead.ui \
-        alarmdialog.ui
-    HEADERS += roomstabcontainer.h \
-        nowtabcontainer.h \
-        trackstabcontainer.h \
-        favtabcontainer.h \
-        searchtabcontainer.h \
-        searchhead.h \
-        dayviewtabcontainer.h \
-        alarmdialog.h
-    SOURCES += roomstabcontainer.cpp \
-        nowtabcontainer.cpp \
-        trackstabcontainer.cpp \
-        favtabcontainer.cpp \
-        searchtabcontainer.cpp \
-        searchhead.cpp \
-        dayviewtabcontainer.cpp \
-        alarmdialog.cpp
+    FORMS += alarmdialog.ui
+    HEADERS += alarmdialog.h
+    SOURCES += alarmdialog.cpp
 }