From 3bd1a70fafc49cf24eef5e1034debe802e7ea776 Mon Sep 17 00:00:00 2001 From: xavierqet Date: Sat, 1 Dec 2007 21:19:01 +0000 Subject: [PATCH] Sous Windows, QET utilise desormais la variable d'environnement APPDATA git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@222 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- editor/qetelementeditor.cpp | 1 - elementtextitem.h | 2 +- exportdialog.cpp | 1 - qetapp.cpp | 9 ++++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/editor/qetelementeditor.cpp b/editor/qetelementeditor.cpp index cfdd285ec..ed779bfff 100644 --- a/editor/qetelementeditor.cpp +++ b/editor/qetelementeditor.cpp @@ -621,4 +621,3 @@ void QETElementEditor::writeSettings() { settings.setValue("elementeditor/geometry", saveGeometry()); settings.setValue("elementeditor/state", saveState()); } - diff --git a/elementtextitem.h b/elementtextitem.h index 604420516..a1ff9c3de 100644 --- a/elementtextitem.h +++ b/elementtextitem.h @@ -42,7 +42,7 @@ class ElementTextItem : public DiagramTextItem { // methodes public: virtual int type() const { return Type; } - virtual QRectF boundingRect() const { return(QGraphicsTextItem::boundingRect().adjusted(0.0, -1.0, 0.0, 0.0)); } + virtual QRectF boundingRect() const { return(QGraphicsTextItem::boundingRect().adjusted(0.0, -1.1, 0.0, 0.0)); } bool followParentRotations() const; void setFollowParentRotations(bool); void fromXml(const QDomElement &); diff --git a/exportdialog.cpp b/exportdialog.cpp index d579e562f..7b378ef75 100644 --- a/exportdialog.cpp +++ b/exportdialog.cpp @@ -452,4 +452,3 @@ void ExportDialog::slot_refreshPreview() { preview_scene -> addItem(qgpi); preview_scene -> setSceneRect(QRectF(0.0, 0.0, preview_image.width(), preview_image.height())); } - diff --git a/qetapp.cpp b/qetapp.cpp index 4b58b5084..a64ad277a 100644 --- a/qetapp.cpp +++ b/qetapp.cpp @@ -263,7 +263,14 @@ QString QETApp::configDir() { if (config_dir != QString()) return(config_dir); #endif #ifdef Q_OS_WIN32 - return(QDir::homePath() + "/Application Data/qet/"); + // recupere l'emplacement du dossier Application Data + char *app_data_env = getenv("APPDATA"); + QString app_data_str(app_data_env); + delete app_data_env; + if (app_data_str.isEmpty()) { + app_data_str = QDir::homePath() + "/Application Data"; + } + return(app_data_str + "/qet/"); #else return(QDir::homePath() + "/.qet/"); #endif