show current user in window title

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@216 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/src/overview.cpp b/src/overview.cpp
index 19bf76e..0d06a65 100644 (file)
--- a/src/overview.cpp
+++ b/src/overview.cpp
@@ -55,7 +55,7 @@ MOverview::MOverview(MWebRequest*mw,QString pk)
        profilekey=pk;
        req=mw;
        setAttribute(Qt::WA_DeleteOnClose);
-       setWindowTitle("MagicSmoke: "+QSettings().value("profiles/"+pk+"/name").toString());
+       setWindowTitle("MagicSmoke: "+mw->currentUser()+"@"+QSettings().value("profiles/"+pk+"/name").toString());
        rtimer.setInterval(QSettings().value("profiles/"+pk+"/refresh",300).toInt()*1000);
        rtimer.start();
        connect(&rtimer,SIGNAL(timeout()),this,SLOT(refreshData()));

diff --git a/src/phpscan.pri b/src/phpscan.pri
index d5326dd..4f163c5 100644 (file)
--- a/src/phpscan.pri
+++ b/src/phpscan.pri
@@ -3,41 +3,40 @@
 #use genphpscan.sh to regenerate it!
 
 HEADERS += \
-../www/inc/db/db_mysql.php \
+../www/inc/global_functions.php \
+../www/inc/tr.php \
+../www/inc/global_variables.php \
 ../www/inc/db/db_scheme.php \
 ../www/inc/db/db.php \
-../www/inc/loader_nonadmin.php \
-../www/inc/listing.php \
-../www/inc/machine/cauth_hash.php \
+../www/inc/db/db_mysql.php \
+../www/inc/machine/template.php \
 ../www/inc/machine/version.php \
+../www/inc/machine/cauth_string.php \
 ../www/inc/machine/host.php \
 ../www/inc/machine/cauth_mhash.php \
+../www/inc/machine/cauth_hash.php \
 ../www/inc/machine/session.php \
-../www/inc/machine/template.php \
-../www/inc/machine/cauth_string.php \
-../www/inc/global_variables.php \
-../www/inc/loader.php \
-../www/inc/global_functions.php \
-../www/inc/tr.php \
-../www/inc/rendering/event_listing.php \
 ../www/inc/rendering/cart_listing.php \
-../www/inc/rendering/submit.php \
+../www/inc/rendering/event_listing.php \
 ../www/inc/rendering/order_listing.php \
+../www/inc/rendering/submit.php \
+../www/inc/loader.php \
+../www/inc/listing.php \
+../www/inc/classes/websession.php \
 ../www/inc/classes/random.php \
+../www/inc/classes/room.php \
+../www/inc/classes/ticket.php \
+../www/inc/classes/cart.php \
 ../www/inc/classes/parser.php \
-../www/inc/classes/customer.php \
 ../www/inc/classes/language_manager.php \
-../www/inc/classes/ticket.php \
+../www/inc/classes/customer.php \
+../www/inc/classes/error.php \
 ../www/inc/classes/event.php \
-../www/inc/classes/order.php \
 ../www/inc/classes/config_manager.php \
-../www/inc/classes/cart.php \
-../www/inc/classes/room.php \
+../www/inc/classes/order.php \
 ../www/inc/classes/voucher.php \
-../www/inc/classes/websession.php \
-../www/inc/classes/error.php \
+../www/inc/loader_nonadmin.php \
 ../www/admin.php \
-../www/config.php \
-../www/machine.php \
 ../www/index.php \
+../www/machine.php \
 

diff --git a/src/webrequest.h b/src/webrequest.h
index df75eb3..5e0e10f 100644 (file)
--- a/src/webrequest.h
+++ b/src/webrequest.h
@@ -111,6 +111,9 @@ class MWebRequest:public QObject
                /**returns the requested template as cached locally (see MTemplateStore for details)*/
                MTemplate getTemplate(QString);
                
+               /**returns currently logged in user*/
+               QString currentUser()const{return user;}
+               
        public slots:
                /**set how long to wait for a web request*/
                void setTimeout(int);