[PC-BSD Commits] r208 - pcbsd/trunk/XGUISource

[svn at pcbsd.org]

Author: kris
Date: 2007-05-09 18:18:21 +0100 (Wed, 09 May 2007)
New Revision: 208

Added:
   pcbsd/trunk/XGUISource/dialogconfirm.ui
   pcbsd/trunk/XGUISource/dialogconfirm.ui.h
Modified:
   pcbsd/trunk/XGUISource/Makefile
   pcbsd/trunk/XGUISource/XGUI.pro
   pcbsd/trunk/XGUISource/main.cpp
Log:
Added dialog option which allows the user to confirm a newly tested resolution

Modified: pcbsd/trunk/XGUISource/Makefile
===================================================================
--- pcbsd/trunk/XGUISource/Makefile	2007-05-08 19:47:45 UTC (rev 207)
+++ pcbsd/trunk/XGUISource/Makefile	2007-05-09 17:18:21 UTC (rev 208)
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: /PCBSD/xorg-gui/bin/XGUI
-# Generated by qmake (1.07a) (Qt 3.3.8) on: Thu May  3 10:59:11 2007
+# Generated by qmake (1.07a) (Qt 3.3.8) on: Tue May  8 22:24:41 2007
 # Project:  XGUI.pro
 # Template: app
 # Command: $(QMAKE) -o Makefile XGUI.pro
@@ -49,12 +49,18 @@
 SOURCES = main.cpp
 OBJECTS = .obj/main.o \
 		.obj/xgui.o \
+		.obj/dialogconfirm.o \
 		.obj/qmake_image_collection.o
-FORMS = xgui.ui
-UICDECLS = .ui/xgui.h
-UICIMPLS = .ui/xgui.cpp
-SRCMOC   = .moc/moc_xgui.cpp
-OBJMOC = .obj/moc_xgui.o
+FORMS = xgui.ui \
+		dialogconfirm.ui
+UICDECLS = .ui/xgui.h \
+		.ui/dialogconfirm.h
+UICIMPLS = .ui/xgui.cpp \
+		.ui/dialogconfirm.cpp
+SRCMOC   = .moc/moc_xgui.cpp \
+		.moc/moc_dialogconfirm.cpp
+OBJMOC = .obj/moc_xgui.o \
+		.obj/moc_dialogconfirm.o
 DIST	   = XGUI.pro
 QMAKE_TARGET = XGUI
 DESTDIR  = /PCBSD/xorg-gui/bin/
@@ -100,7 +106,7 @@
 	@$(QMAKE) -o Makefile XGUI.pro
 
 dist: 
-	@mkdir -p .obj/XGUI && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .obj/XGUI/ && $(COPY_FILE) --parents monitor.png .obj/XGUI/ && $(COPY_FILE) --parents xgui.ui.h .obj/XGUI/ && ( cd `dirname .obj/XGUI` && $(TAR) XGUI.tar XGUI && $(GZIP) XGUI.tar ) && $(MOVE) `dirname .obj/XGUI`/XGUI.tar.gz . && $(DEL_FILE) -r .obj/XGUI
+	@mkdir -p .obj/XGUI && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .obj/XGUI/ && $(COPY_FILE) --parents monitor.png .obj/XGUI/ && $(COPY_FILE) --parents xgui.ui.h dialogconfirm.ui.h .obj/XGUI/ && ( cd `dirname .obj/XGUI` && $(TAR) XGUI.tar XGUI && $(GZIP) XGUI.tar ) && $(MOVE) `dirname .obj/XGUI`/XGUI.tar.gz . && $(DEL_FILE) -r .obj/XGUI
 
 mocclean:
 	-$(DEL_FILE) $(OBJMOC)
@@ -127,7 +133,8 @@
 
 ####### Compile
 
-.obj/main.o: main.cpp .ui/xgui.h
+.obj/main.o: main.cpp .ui/xgui.h \
+		.ui/dialogconfirm.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/main.o main.cpp
 
 .ui/xgui.h: xgui.ui 
@@ -136,16 +143,32 @@
 .ui/xgui.cpp: .ui/xgui.h xgui.ui xgui.ui.h 
 	$(UIC) xgui.ui -i xgui.h -o .ui/xgui.cpp
 
+.ui/dialogconfirm.h: dialogconfirm.ui 
+	$(UIC) dialogconfirm.ui -o .ui/dialogconfirm.h
+
+.ui/dialogconfirm.cpp: .ui/dialogconfirm.h dialogconfirm.ui dialogconfirm.ui.h 
+	$(UIC) dialogconfirm.ui -i dialogconfirm.h -o .ui/dialogconfirm.cpp
+
 .obj/xgui.o: .ui/xgui.cpp xgui.ui.h \
 		.ui/xgui.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/xgui.o .ui/xgui.cpp
 
+.obj/dialogconfirm.o: .ui/dialogconfirm.cpp dialogconfirm.ui.h \
+		.ui/dialogconfirm.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/dialogconfirm.o .ui/dialogconfirm.cpp
+
 .obj/moc_xgui.o: .moc/moc_xgui.cpp  .ui/xgui.h 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/moc_xgui.o .moc/moc_xgui.cpp
 
+.obj/moc_dialogconfirm.o: .moc/moc_dialogconfirm.cpp  .ui/dialogconfirm.h 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/moc_dialogconfirm.o .moc/moc_dialogconfirm.cpp
+
 .moc/moc_xgui.cpp: $(MOC) .ui/xgui.h
 	$(MOC) .ui/xgui.h -o .moc/moc_xgui.cpp
 
+.moc/moc_dialogconfirm.cpp: $(MOC) .ui/dialogconfirm.h
+	$(MOC) .ui/dialogconfirm.h -o .moc/moc_dialogconfirm.cpp
+
 .obj/qmake_image_collection.o: .ui/qmake_image_collection.cpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/qmake_image_collection.o .ui/qmake_image_collection.cpp
 

Modified: pcbsd/trunk/XGUISource/XGUI.pro
===================================================================
--- pcbsd/trunk/XGUISource/XGUI.pro	2007-05-08 19:47:45 UTC (rev 207)
+++ pcbsd/trunk/XGUISource/XGUI.pro	2007-05-09 17:18:21 UTC (rev 208)
@@ -2,15 +2,20 @@
 LANGUAGE	= C++
 
 CONFIG	+= qt warn_on release
-TARGET  = XGUI
-DESTDIR = /PCBSD/xorg-gui/bin/
 
 SOURCES	+= main.cpp
 
-FORMS	= xgui.ui
+FORMS	= xgui.ui \
+	dialogconfirm.ui
 
 IMAGES	= monitor.png
 
+TARGET  = XGUI
+DESTDIR = /PCBSD/xorg-gui/bin/
+
+
+
+
 unix {
   UI_DIR = .ui
   MOC_DIR = .moc

Added: pcbsd/trunk/XGUISource/dialogconfirm.ui

Added: pcbsd/trunk/XGUISource/dialogconfirm.ui.h

Modified: pcbsd/trunk/XGUISource/main.cpp
===================================================================
--- pcbsd/trunk/XGUISource/main.cpp	2007-05-08 19:47:45 UTC (rev 207)
+++ pcbsd/trunk/XGUISource/main.cpp	2007-05-09 17:18:21 UTC (rev 208)
@@ -1,9 +1,22 @@
 #include <qapplication.h>
 #include "xgui.h"
+#include "dialogconfirm.h"
 
 int main( int argc, char ** argv )
 {
     QApplication a( argc, argv );
+    
+    QString Tmp = a.argv()[1];
+  
+    if ( Tmp == "-test") {
+        XGUI w;
+	dialogConfirm d;
+        d.ProgramInit();
+        d.show();
+        a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
+        return a.exec();
+    } 
+
     XGUI w;
     w.ProgramInit();
     w.show();