Build process being remodeled for a more automated task.

Side image bar was removed from all forms giving a clean look for them. Links to social network profiles were removed from about form added the link to project's official home page.
pgmodeler · Sep 30, 2012 · 3ac3c88 · 3ac3c88
1 parent 78bd313
commit 3ac3c88
Show file tree

Hide file tree

Showing 33 changed files with 294 additions and 1,017 deletions.
diff --git a/libconexbd/libconexbd.pro b/libconexbd/libconexbd.pro
@@ -1,12 +1,10 @@
 include(../pgmodeler.pro)
 
-CONFIG += qt warn_on uitools uic4
-QT = core gui qt3support
 TEMPLATE = lib
 TARGET = conexbd
 DESTDIR = ../build/lib
-DEPENDPATH = ". src obj"
 OBJECTS_DIR = obj
+
 LIBS += $$DESTDIR/$$LIBUTIL
 
 HEADERS += $$PWD/src/conexaobd.h \

diff --git a/libobjrenderer/libobjrenderer.pro b/libobjrenderer/libobjrenderer.pro
@@ -1,12 +1,8 @@
 include(../pgmodeler.pro)
 
-CONFIG += qt warn_on uitools uic4
-QT = core gui qt3support
 TEMPLATE = lib
 TARGET = objrenderer
 DESTDIR = ../build/lib
-DEPENDPATH = ". src obj"
-OBJECTS_DIR = obj
 
 LIBS += $$DESTDIR/$$LIBUTIL \
         $$DESTDIR/$$LIBPARSERS \

diff --git a/libparsers/libparsers.pro b/libparsers/libparsers.pro
@@ -1,12 +1,8 @@
 include(../pgmodeler.pro)
 
-CONFIG += qt warn_on uitools uic4
-QT = core gui qt3support
 TEMPLATE = lib
 TARGET = parsers
 DESTDIR = ../build/lib
-DEPENDPATH = ". src obj"
-OBJECTS_DIR = obj
 
 LIBS += $$DESTDIR/$$LIBUTIL
 

diff --git a/libpgmodeler/libpgmodeler.pro b/libpgmodeler/libpgmodeler.pro
@@ -1,12 +1,8 @@
 include(../pgmodeler.pro)
 
-CONFIG += qt warn_on uitools uic4
-QT = core gui qt3support
 TEMPLATE = lib
 TARGET = pgmodeler
 DESTDIR = ../build/lib
-DEPENDPATH = ". src obj"
-OBJECTS_DIR = obj
 
 LIBS += $$DESTDIR/$$LIBUTIL \
         $$DESTDIR/$$LIBPARSERS

diff --git a/libpgmodeler_ui/libpgmodeler_ui.pro b/libpgmodeler_ui/libpgmodeler_ui.pro
@@ -1,28 +1,10 @@
 include(../pgmodeler.pro)
 
-CONFIG += qt warn_on uitools uic4
-QT = core gui qt3support
 TEMPLATE = lib
 TARGET = pgmodeler_ui
-
-DEPENDPATH = ". res src ui moc obj"
-MOC_DIR = moc
-OBJECTS_DIR = obj
-UI_DIR = src
 DESTDIR = ../build/lib
 RESOURCES += $$PWD/res/resources.qrc
 
-unix {
- QMAKE_POST_LINK+= "cp res/imagens/pgmodeler_logo_grande.png ../build/pgmodeler.png"
-}
-
-windows {
- DEST=..\\build
- QMAKE_POST_LINK+= "copy res\\imagens\\pgmodeler_logo_grande.png $$DEST\\pgmodeler.png"
-}
-
-QMAKE_DISTCLEAN+= "../build/pgmodeler.png"
-
 LIBS = $$DESTDIR/$$LIBUTIL \
        $$DESTDIR/$$LIBPARSERS \
        $$DESTDIR/$$LIBCONEXBD \

diff --git a/libpgmodeler_ui/res/imagens/barra_logo_base.png b/libpgmodeler_ui/res/imagens/barra_logo_base.png
diff --git a/libpgmodeler_ui/res/imagens/barra_logo_meio_cinza.png b/libpgmodeler_ui/res/imagens/barra_logo_meio_cinza.png
diff --git a/libpgmodeler_ui/res/imagens/barra_logo_topo.png b/libpgmodeler_ui/res/imagens/barra_logo_topo.png
diff --git a/libpgmodeler_ui/res/imagens/facebook.png b/libpgmodeler_ui/res/imagens/facebook.png
diff --git a/libpgmodeler_ui/res/imagens/github.png b/libpgmodeler_ui/res/imagens/github.png
diff --git a/..._ui/res/imagens/pgmodeler_logo_grande.png → ...modeler_ui/res/imagens/pgmodeler_logo.png b/..._ui/res/imagens/pgmodeler_logo_grande.png → ...modeler_ui/res/imagens/pgmodeler_logo.png
diff --git a/libpgmodeler_ui/res/imagens/twitter.png b/libpgmodeler_ui/res/imagens/twitter.png
diff --git a/libpgmodeler_ui/res/resources.qrc b/libpgmodeler_ui/res/resources.qrc
@@ -136,16 +136,11 @@
         <file>icones/padroes.png</file>
     </qresource>
     <qresource prefix="/imagens">
-        <file>imagens/barra_logo_meio_cinza.png</file>
-        <file>imagens/barra_logo_topo.png</file>
-        <file>imagens/barra_logo_base.png</file>
         <file>imagens/model2sql.png</file>
         <file>imagens/model2sgdb.png</file>
-        <file>imagens/twitter.png</file>
-        <file>imagens/facebook.png</file>
-        <file>imagens/github.png</file>
         <file>imagens/pgmodeler_logo_alfa.png</file>
-        <file>imagens/pgmodeler_logo_grande.png</file>
         <file>imagens/model2png.png</file>
+        <file>imagens/pgmodeler_logo.png</file>
+        <file>imagens/pgmodeler_name.png</file>
     </qresource>
 </RCC>
diff --git a/libpgmodeler_ui/src/codigofontewidget.cpp b/libpgmodeler_ui/src/codigofontewidget.cpp
@@ -117,6 +117,7 @@ void CodigoFonteWidget::gerarCodigoFonteObjeto(int)
    if(tipo_obj==OBJETO_BANCO_DADOS)
    {
     prog_tarefa->setWindowTitle(trUtf8("Gerando código-fonte..."));
+    prog_tarefa->show();
     connect(this->modelo, SIGNAL(s_objetoCarregado(int,QString,unsigned)),
             prog_tarefa, SLOT(executarProgesso(int,QString,unsigned)));
    }

diff --git a/libpgmodeler_ui/src/formexportacao.cpp b/libpgmodeler_ui/src/formexportacao.cpp
@@ -161,6 +161,7 @@ void FormExportacao::exportarModelo(void)
 
     //Configura o widget de progresso para capturar o progresso da geração do código
     prog_tarefa->setWindowTitle(trUtf8("Gerando código-fonte..."));
+    prog_tarefa->show();
     connect(this->modelo_wgt->modelo, SIGNAL(s_objetoCarregado(int,QString,unsigned)),
             prog_tarefa, SLOT(executarProgesso(int,QString,unsigned)));
 

diff --git a/libpgmodeler_ui/src/formprincipal.cpp b/libpgmodeler_ui/src/formprincipal.cpp
@@ -133,7 +133,7 @@ FormPrincipal::FormPrincipal(QWidget *parent, Qt::WindowFlags flags) : QMainWind
  indice_wgt=new IndiceWidget(this);
  relacao_wgt=new RelacionamentoWidget(this);
  tabela_wgt=new TabelaWidget(this);
- prog_tarefa=new ProgressoTarefa(this);
+ prog_tarefa=new ProgressoTarefa();
  deps_refs_wgt=new ListaObjetosWidget(this);
 
  for(unsigned i=0; i < 27; i++)

diff --git a/libpgmodeler_ui/src/listaoperacoeswidget.cpp b/libpgmodeler_ui/src/listaoperacoeswidget.cpp
@@ -160,6 +160,7 @@ void ListaOperacoesWidget::desfazerOperacao(void)
   //Exibe o progresso de operações de desfazer
   connect(modelo_wgt->lista_op, SIGNAL(s_operacaoExecutada(int,QString,unsigned)), prog_tarefa, SLOT(executarProgesso(int,QString,unsigned)));
   prog_tarefa->setWindowTitle(trUtf8("Desfazendo operações..."));
+  prog_tarefa->show();
 
   modelo_wgt->lista_op->desfazerOperacao();
 
@@ -186,6 +187,7 @@ void ListaOperacoesWidget::refazerOperacao(void)
   //Exibe o progresso de operações de refazer
   connect(modelo_wgt->lista_op, SIGNAL(s_operacaoExecutada(int,QString,unsigned)), prog_tarefa, SLOT(executarProgesso(int,QString,unsigned)));
   prog_tarefa->setWindowTitle(trUtf8("Refazendo operações..."));
+  prog_tarefa->show();
 
   modelo_wgt->lista_op->refazerOperacao();
 

diff --git a/libpgmodeler_ui/src/modelowidget.cpp b/libpgmodeler_ui/src/modelowidget.cpp
@@ -808,6 +808,7 @@ void ModeloWidget::carregarModelo(const QString &nome_arq)
   //Configura o widget de progresso para exibir o progresso de carregamento do modelo
   connect(modelo, SIGNAL(s_objetoCarregado(int,QString,unsigned)), prog_tarefa, SLOT(executarProgesso(int,QString,unsigned)));
   prog_tarefa->setWindowTitle(trUtf8("Carregando modelo de banco de dados"));
+  prog_tarefa->show();
 
   //Carrega o arquivo
   modelo->carregarModelo(nome_arq);
@@ -1049,6 +1050,7 @@ void ModeloWidget::salvarModelo(const QString &nome_arq)
   //Configura o widget de progresso de tarefa para exibir o progresso do salvamento do arquivo
   connect(modelo, SIGNAL(s_objetoCarregado(int,QString,unsigned)), prog_tarefa, SLOT(executarProgesso(int,QString,unsigned)));
   prog_tarefa->setWindowTitle(trUtf8("Salvando modelo de banco de dados"));
+  prog_tarefa->show();
 
   //Salva o modelo em arquivo
   modelo->salvarModelo(nome_arq, ParserEsquema::DEFINICAO_XML);
@@ -1590,7 +1592,7 @@ void ModeloWidget::colarObjetos(void)
 
  //Exibe o progresso de tarefas pois a operação de colagem
  prog_tarefa->setWindowTitle(trUtf8("Colando objetos..."));
- prog_tarefa->open();
+ prog_tarefa->show();
 
  itr=objs_copiados.begin();
  itr_end=objs_copiados.end();

diff --git a/libpgmodeler_ui/src/progressotarefa.cpp b/libpgmodeler_ui/src/progressotarefa.cpp
@@ -14,9 +14,6 @@ void ProgressoTarefa::adicionarIcone(unsigned id, const QIcon &ico)
 //-----------------------------------------------------------
 void ProgressoTarefa::executarProgesso(int progresso, const QString &texto, unsigned id_icone)
 {
- if(!this->isVisible())
-  this->open();
-
  //Caso o progresso seja maior que o máximo da barra de progresso
  if(progresso > progresso_pb->maximum())
   //O progresso recebe o valor máximo da barra de progresso
@@ -41,6 +38,6 @@ void ProgressoTarefa::close(void)
  progresso_pb->setValue(0);
  texto_lbl->clear();
  icone_lbl->clear();
- QDialog::close();
+ QWidget::close();
 }
 //***********************************************************
diff --git a/libpgmodeler_ui/ui/caixamensagem.ui b/libpgmodeler_ui/ui/caixamensagem.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>210</height>
+    <height>175</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -22,7 +22,7 @@
   <property name="minimumSize">
    <size>
     <width>500</width>
-    <height>210</height>
+    <height>175</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -39,98 +39,7 @@
    <property name="spacing">
     <number>4</number>
    </property>
-   <item row="0" column="0" rowspan="2">
-    <widget class="QWidget" name="imgmeio_wgt" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>60</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>60</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/imagens/imagens/barra_logo_meio_cinza.png); background-repeat: repeat-y;
-border: 1px #ff00ff solid;</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>60</width>
-          <height>82</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>82</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="../res/resources.qrc">:/imagens/imagens/barra_logo_topo.png</pixmap>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>15</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_2">
-        <property name="minimumSize">
-         <size>
-          <width>60</width>
-          <height>119</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>119</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="../res/resources.qrc">:/imagens/imagens/barra_logo_base.png</pixmap>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="0" column="1">
+   <item row="0" column="0">
     <widget class="QFrame" name="frame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -140,8 +49,8 @@ border: 1px #ff00ff solid;</string>
      </property>
      <property name="minimumSize">
       <size>
-       <width>432</width>
-       <height>168</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
      <property name="frameShape">
@@ -217,7 +126,7 @@ border: 1px #ff00ff solid;</string>
         <property name="minimumSize">
          <size>
           <width>424</width>
-          <height>122</height>
+          <height>0</height>
          </size>
         </property>
         <property name="frameShape">
@@ -281,7 +190,7 @@ border: 1px #ff00ff solid;</string>
               <property name="minimumSize">
                <size>
                 <width>0</width>
-                <height>40</height>
+                <height>0</height>
                </size>
               </property>
               <property name="maximumSize">
@@ -315,7 +224,7 @@ border: 1px #ff00ff solid;</string>
                <bool>true</bool>
               </property>
               <property name="margin">
-               <number>1</number>
+               <number>4</number>
               </property>
               <property name="textInteractionFlags">
                <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -410,9 +319,9 @@ border: 1px #ff00ff solid;</string>
      </layout>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="1" column="0">
     <layout class="QGridLayout" name="gridLayout_2">
-     <item row="0" column="0">
+     <item row="0" column="1">
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -425,7 +334,7 @@ border: 1px #ff00ff solid;</string>
        </property>
       </spacer>
      </item>
-     <item row="0" column="1">
+     <item row="0" column="2">
       <widget class="QWidget" name="container_wgt" native="true">
        <layout class="QGridLayout" name="gridLayout">
         <property name="margin">
@@ -503,6 +412,16 @@ border: 1px #ff00ff solid;</string>
        </layout>
       </widget>
      </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../res/resources.qrc">:/imagens/imagens/pgmodeler_name.png</pixmap>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>