Changeset 2b8a19b


Ignore:
Timestamp:
12/06/13 01:47:14 (13 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
470a9c04, f74a1b6
Parents:
3b696abf
Message:

System branches dialog (view only); Set caption for some dialogs

Location:
src-qt4/pc-updatecenter
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-updatecenter/dialogs/jailsdialog.ui

    re9b4e63 r2b8a19b  
    1212  </property> 
    1313  <property name="windowTitle"> 
    14    <string>Dialog</string> 
     14   <string>Select jail</string> 
    1515  </property> 
    1616  <property name="modal"> 
  • src-qt4/pc-updatecenter/dialogs/logviewdialog.ui

    rf82009e r2b8a19b  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>389</width> 
    10     <height>291</height> 
     9    <width>387</width> 
     10    <height>289</height> 
    1111   </rect> 
    1212  </property> 
    1313  <property name="windowTitle"> 
    14    <string>Dialog</string> 
     14   <string>Loast update log</string> 
    1515  </property> 
    1616  <property name="modal"> 
  • src-qt4/pc-updatecenter/mainwindow.cpp

    r3b696abf r2b8a19b  
    2929#include "dialogs/logviewdialog.h" 
    3030#include "dialogs/jailsdialog.h" 
     31#include "dialogs/branchesdialog.h" 
    3132 
    3233#include <QTreeWidgetItem> 
     
    203204 
    204205    ui->actionJail->setEnabled(is_no_upd); 
     206    ui->actionSystem_branches->setEnabled(is_no_upd && (!mJail.jailEnabled())); 
    205207} 
    206208 
     
    351353    jailRefresh(); 
    352354} 
     355 
     356/////////////////////////////////////////////////////////////////////////////// 
     357void MainWindow::on_actionSystem_branches_triggered() 
     358{ 
     359    BranchesDialog* dlg = new BranchesDialog(this); 
     360    dlg->exec(); 
     361} 
  • src-qt4/pc-updatecenter/mainwindow.h

    r3b696abf r2b8a19b  
    8080    void on_actionExit_triggered(); 
    8181    void on_actionJail_triggered(); 
     82    void on_actionSystem_branches_triggered(); 
    8283}; 
    8384 
  • src-qt4/pc-updatecenter/mainwindow.ui

    r43257ed r2b8a19b  
    423423  <action name="actionSystem_branches"> 
    424424   <property name="enabled"> 
    425     <bool>false</bool> 
     425    <bool>true</bool> 
    426426   </property> 
    427427   <property name="text"> 
  • src-qt4/pc-updatecenter/pc-updatecenter.pro

    r43257ed r2b8a19b  
    3434    dialogs/jailsdialog.cpp \ 
    3535    jailsbackend.cpp \ 
    36     jailindicator.cpp 
     36    jailindicator.cpp \ 
     37    dialogs/branchesdialog.cpp 
    3738 
    3839HEADERS  += mainwindow.h \ 
     
    5152    dialogs/jailsdialog.h \ 
    5253    jailsbackend.h \ 
    53     jailindicator.h 
     54    jailindicator.h \ 
     55    dialogs/branchesdialog.h 
    5456 
    5557FORMS    += mainwindow.ui \ 
     
    6264    rebootwidget.ui \ 
    6365    dialogs/jailsdialog.ui \ 
    64     jailindicator.ui 
     66    jailindicator.ui \ 
     67    dialogs/branchesdialog.ui 
    6568 
    6669RESOURCES += \ 
Note: See TracChangeset for help on using the changeset viewer.