Changeset 93198a8 in subsurface


Ignore:
Timestamp:
Feb 10, 2015, 10:45:45 AM (3 years ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
Mtest, android_test, dcDownload, foratdotde, gitMerge, gitdebug, gitpictures, ios, master, mergeKirigamiPort, pictimeshift, resolutionIndependence, spinner, testTomaz, testing, v4.5-branch
Children:
57e938d0
Parents:
486226b
git-author:
Tomaz Canabrava <tomaz.canabrava@…> (02/09/15 11:09:06)
git-committer:
Dirk Hohndel <dirk@…> (02/10/15 10:45:45)
Message:

Change splitter names to something more meaningfull

listGlobe and infoProfileSplitters weren't good names as
now we will be able to create more types of widgets there

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@…>
Signed-off-by: Dirk Hohndel <dirk@…>

Location:
qt-ui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • qt-ui/mainwindow.cpp

    r727e397a r93198a8  
    631631        ui.mainSplitter->setCollapsible(0, X); \
    632632        ui.mainSplitter->setCollapsible(1, X); \
    633         ui.infoProfileSplitter->setCollapsible(0, X); \
    634         ui.infoProfileSplitter->setCollapsible(1, X); \
    635         ui.listGlobeSplitter->setCollapsible(0, X); \
    636         ui.listGlobeSplitter->setCollapsible(1, X);
     633        ui.topSplitter->setCollapsible(0, X); \
     634        ui.topSplitter->setCollapsible(1, X); \
     635        ui.bottomSplitter->setCollapsible(0, X); \
     636        ui.bottomSplitter->setCollapsible(1, X);
    637637
    638638void MainWindow::on_actionViewList_triggered()
     
    640640        TOGGLE_COLLAPSABLE( true );
    641641        beginChangeState(LIST_MAXIMIZED);
    642         ui.listGlobeSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED);
     642        ui.topSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED);
    643643        ui.mainSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED);
    644644}
     
    648648        TOGGLE_COLLAPSABLE( true );
    649649        beginChangeState(PROFILE_MAXIMIZED);
    650         ui.infoProfileSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED);
     650        ui.topSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED);
    651651        ui.mainSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED);
    652652}
     
    656656        TOGGLE_COLLAPSABLE( true );
    657657        beginChangeState(INFO_MAXIMIZED);
    658         ui.infoProfileSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED);
     658        ui.topSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED);
    659659        ui.mainSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED);
    660660}
     
    665665        beginChangeState(GLOBE_MAXIMIZED);
    666666        ui.mainSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED);
    667         ui.listGlobeSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED);
     667        ui.bottomSplitter->setSizes(BEHAVIOR << COLLAPSED << EXPANDED);
    668668}
    669669#undef BEHAVIOR
     
    696696        if (settings.value("mainSplitter").isValid()) {
    697697                ui.mainSplitter->restoreState(settings.value("mainSplitter").toByteArray());
    698                 ui.infoProfileSplitter->restoreState(settings.value("infoProfileSplitter").toByteArray());
    699                 ui.listGlobeSplitter->restoreState(settings.value("listGlobeSplitter").toByteArray());
     698                ui.topSplitter->restoreState(settings.value("topSplitter").toByteArray());
     699                ui.bottomSplitter->restoreState(settings.value("bottomSplitter").toByteArray());
    700700                if (ui.mainSplitter->sizes().first() == 0 || ui.mainSplitter->sizes().last() == 0)
    701701                        ui.mainSplitter->setSizes(mainSizes);
    702                 if (ui.infoProfileSplitter->sizes().first() == 0 || ui.infoProfileSplitter->sizes().last() == 0)
    703                         ui.infoProfileSplitter->setSizes(infoProfileSizes);
    704                 if (ui.listGlobeSplitter->sizes().first() == 0 || ui.listGlobeSplitter->sizes().last() == 0)
    705                         ui.listGlobeSplitter->setSizes(listGlobeSizes);
     702                if (ui.topSplitter->sizes().first() == 0 || ui.topSplitter->sizes().last() == 0)
     703                        ui.topSplitter->setSizes(infoProfileSizes);
     704                if (ui.bottomSplitter->sizes().first() == 0 || ui.bottomSplitter->sizes().last() == 0)
     705                        ui.bottomSplitter->setSizes(listGlobeSizes);
    706706
    707707        } else {
    708708                ui.mainSplitter->setSizes(mainSizes);
    709                 ui.infoProfileSplitter->setSizes(infoProfileSizes);
    710                 ui.listGlobeSplitter->setSizes(listGlobeSizes);
     709                ui.topSplitter->setSizes(infoProfileSizes);
     710                ui.bottomSplitter->setSizes(listGlobeSizes);
    711711        }
    712712        ui.mainSplitter->setCollapsible(0, false);
    713713        ui.mainSplitter->setCollapsible(1, false);
    714         ui.infoProfileSplitter->setCollapsible(0, false);
    715         ui.infoProfileSplitter->setCollapsible(1, false);
    716         ui.listGlobeSplitter->setCollapsible(0,false);
    717         ui.listGlobeSplitter->setCollapsible(1,false);
     714        ui.topSplitter->setCollapsible(0, false);
     715        ui.topSplitter->setCollapsible(1, false);
     716        ui.bottomSplitter->setCollapsible(0,false);
     717        ui.bottomSplitter->setCollapsible(1,false);
    718718}
    719719
     
    733733        settings.beginGroup("MainWindow");
    734734        settings.setValue("mainSplitter", ui.mainSplitter->saveState());
    735         settings.setValue("infoProfileSplitter", ui.infoProfileSplitter->saveState());
    736         settings.setValue("listGlobeSplitter", ui.listGlobeSplitter->saveState());
     735        settings.setValue("topSplitter", ui.topSplitter->saveState());
     736        settings.setValue("bottomSplitter", ui.bottomSplitter->saveState());
    737737}
    738738
  • qt-ui/mainwindow.ui

    rc5138b2 r93198a8  
    2424       <enum>Qt::Vertical</enum>
    2525      </property>
    26       <widget class="QSplitter" name="infoProfileSplitter">
     26      <widget class="QSplitter" name="topSplitter">
    2727       <property name="orientation">
    2828        <enum>Qt::Horizontal</enum>
     
    6565       </widget>
    6666      </widget>
    67       <widget class="QSplitter" name="listGlobeSplitter">
     67      <widget class="QSplitter" name="bottomSplitter">
    6868       <property name="orientation">
    6969        <enum>Qt::Horizontal</enum>
Note: See TracChangeset for help on using the changeset viewer.