diff options
author | Arno <am@disconnect.de> | 2013-07-19 14:13:15 +0200 |
---|---|---|
committer | Arno <am@disconnect.de> | 2013-07-19 14:13:15 +0200 |
commit | 333fcd118f601efa36a272f4e6a0f4525a3a0626 (patch) | |
tree | e30745fe3b8e4eb33e49ae26f0fada6ced8dd4a7 /shemov.cpp | |
parent | fd65ae2d1eb8d601108aa845cfd64654af897a2a (diff) | |
parent | 99a05672a62b406178630aa87bf675b2fda3be76 (diff) | |
download | SheMov-333fcd118f601efa36a272f4e6a0f4525a3a0626.tar.gz SheMov-333fcd118f601efa36a272f4e6a0f4525a3a0626.tar.bz2 SheMov-333fcd118f601efa36a272f4e6a0f4525a3a0626.zip |
Merge ssh://192.168.222.14/home/amoeller/devel/SheMov into archive_view
Conflicts:
shemov.cpp
shemov.h
Diffstat (limited to 'shemov.cpp')
-rw-r--r-- | shemov.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -100,9 +100,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla mNewMovieWizard->setMinimumWidth(1024); ArchiveController *c = SmGlobals::instance()->archiveController(); connect(mNewMovieWizard, SIGNAL(accepted()), c->archiveTreeModel(), SLOT(refresh())); - /*mDbAnalyzerDialog = new DbAnalyzerDialog(this); - connect(mDbAnalyzerDialog, SIGNAL(partClicked(int, int)), mATree, SLOT(selectMoviePart(int, int))); - connect(mDbAnalyzerDialog, SIGNAL(delItems(int,QList<int>&)), this, SLOT(analyzeDelete(int,QList<int>&)));*/ mNewPicsDialog = new NewPicsDialog(this); QVBoxLayout *mainLayout = new QVBoxLayout; |