[pwgui] Also use the grayed out fake background

7 files changed, 30 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0745441..4d9b9cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,10 +9,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
 IF (CMAKE_BUILD_TYPE STREQUAL "")
 	SET(CMAKE_BUILD_TYPE Debug)
 ENDIF()
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall -Wunused -Wunreachable-code -pedantic -fno-strict-aliasing")
-SET(CMAKE_C_FLAGS_RELEASE "-O2 -fno-strict-aliasing")
-SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall -Wunused -Wunreachable-code -pedantic -fno-strict-aliasing")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -fno-strict-aliasing" )
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall -Wunused -Wunreachable-code -pedantic -fno-strict-aliasing -std=gnu99")
+SET(CMAKE_C_FLAGS_RELEASE "-O2 -fno-strict-aliasing -std=gnu99")
+SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall -Wunused -Wunreachable-code -pedantic -fno-strict-aliasing -std=gnu++0x")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -fno-strict-aliasing -std=gnu++0x" )
 
 # local cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@ -34,11 +34,13 @@ INCLUDE_DIRECTORIES(
 # printergui (maingui)
 FILE(GLOB MAINGUI_SRCS
 	src/maingui/*.cpp
+	src/*.cpp
 )
 
 # password gui (printpwgui
 FILE(GLOB PWGUI_SRCS
 	src/pwgui/*.cpp
+	src/*.cpp
 )
 
 ################################################################################
@@ -61,11 +63,12 @@ FILE(GLOB PWGUI_UIS
 # includes all header files that should be treated with moc
 SET(MAINGUI_MOC_HDRS
 	src/maingui/printergui.h
-	src/maingui/backdrop.h
+	src/backdrop.h
 )
 
 SET(PWGUI_MOC_HDRS
 	src/pwgui/pwgui.h
+	src/backdrop.h
 )
 
 # i18n
diff --git a/src/maingui/backdrop.cpp b/src/backdrop.cpp
index 4a907e8..4a907e8 100644
--- a/src/maingui/backdrop.cpp
+++ b/src/backdrop.cpp
diff --git a/src/maingui/backdrop.h b/src/backdrop.h
index b798a89..b798a89 100644
--- a/src/maingui/backdrop.h
+++ b/src/backdrop.h
diff --git a/src/maingui/main.cpp b/src/maingui/main.cpp
index 25f81a0..58ace07 100644
--- a/src/maingui/main.cpp
+++ b/src/maingui/main.cpp
@@ -2,7 +2,7 @@
 #include <QMessageBox>
 #include <fstream>
 #include "printergui.h"
-#include "backdrop.h"
+#include "../backdrop.h"
 #include <fcntl.h>
 #include <sys/stat.h>
 
diff --git a/src/maingui/printergui.cpp b/src/maingui/printergui.cpp
index 21e03f4..0dd9e13 100644
--- a/src/maingui/printergui.cpp
+++ b/src/maingui/printergui.cpp
@@ -112,7 +112,15 @@ void PrinterGui::initializeUI()
 	QRect desktopRect = QApplication::desktop()->screenGeometry(this);
 	this->move( desktopRect.width()/2-this->width()/2,
 	            desktopRect.height()/2-this->height()/2);
-	this->setWindowTitle(QString::fromUtf8("Drucken - %1").arg(this->user));
+	const char *docName;
+	docName = getenv("J");
+	if (docName == NULL) {
+		docName = getenv("N");
+	}
+	if (docName == NULL) {
+		docName = "Untitled";
+	}
+	this->setWindowTitle(QString::fromUtf8("Drucken - %1 [%2]").arg(this->user, QString::fromUtf8(docName)));
 
 	this->show();
 	this->showNormal();
diff --git a/src/pwgui/main.cpp b/src/pwgui/main.cpp
index b916259..65fd469 100644
--- a/src/pwgui/main.cpp
+++ b/src/pwgui/main.cpp
@@ -1,4 +1,5 @@
 #include "pwgui.h"
+#include "../backdrop.h"
 #include "config.h"
 #include <QApplication>
 #include <QMessageBox>
@@ -183,8 +184,14 @@ int main(int argc, char *argv[])
 			helper_dropprivs();
 			helper_copyenv();
 			QApplication a(argc, argv);
-			PwGui w(pfd[1], creds);
-			w.show();
+			Backdrop *bg = new Backdrop;
+			bg->show();
+			bg->raise();
+			bg->activateWindow();
+			bg->move(0, 0);
+			PwGui *w = new PwGui(pfd[1], creds);
+			bg->setMainWindow(w);
+			w->show();
 			exit(a.exec());
 			return CUPS_BACKEND_FAILED;
 		}
diff --git a/src/pwgui/pwgui.cpp b/src/pwgui/pwgui.cpp
index 193341b..b6130f0 100644
--- a/src/pwgui/pwgui.cpp
+++ b/src/pwgui/pwgui.cpp
@@ -29,6 +29,9 @@ PwGui::~PwGui()
 void PwGui::initializeUI(char *user)
 {
 	ui->setupUi(this);
+	this->setWindowModality(Qt::ApplicationModal);
+		// Put always on top
+		this->setWindowFlags(Qt::Dialog | Qt::WindowStaysOnTopHint);
 
 	// Prefill username
 	if (user != NULL) {
@@ -41,8 +44,6 @@ void PwGui::initializeUI(char *user)
 
 	/*  Main Window properties  */
 
-	// Disable close button
-	this->setWindowFlags((this->windowFlags() & ~Qt::WindowCloseButtonHint) | Qt::WindowStaysOnTopHint);
 	// center dialog on screen center
 	QRect desktopRect = QApplication::desktop()->screenGeometry(this);
 	this->move( desktopRect.width()/2-this->width()/2,