Respect the layout preference (just the horizontal/vertical splitting of the

panes, not yet which data goes in which pane).

You currently have to restart for the change to take effect. I also had to move
the preferences-reading (and thus the epan_init) call to before the main window
instantiation so that the preference was actually available for use. This means
that the progress-bar doesn't show up for very long any more, since most of the
work is already done by the time it appears.

I'm sure there is a way to delay just the layout setup until later, but I kept
getting slot errors I couldn't figure out...

svn path=/trunk/; revision=51647

1 files changed, 3 insertions, 3 deletions

diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 1e2750c635..a33df3d6b1 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -224,7 +224,7 @@ void MainWindow::captureCapturePrepared(capture_session *cap_session) {
 
 //    /* Don't set up main window for a capture file. */
 //    main_set_for_capture_file(FALSE);
-    main_ui_->mainStack->setCurrentWidget(packet_splitter_);
+    main_ui_->mainStack->setCurrentWidget(master_split_);
     cap_file_ = (capture_file *) cap_session->cf;
 }
 void MainWindow::captureCaptureUpdateStarted(capture_session *cap_session) {
@@ -306,7 +306,7 @@ void MainWindow::captureFileReadStarted(const capture_file *cf) {
     main_ui_->statusBar->popFileStatus();
     QString msg = QString(tr("Loading: %1")).arg(get_basename(cf->filename));
     main_ui_->statusBar->pushFileStatus(msg);
-    main_ui_->mainStack->setCurrentWidget(packet_splitter_);
+    main_ui_->mainStack->setCurrentWidget(master_split_);
     WiresharkApplication::processEvents();
 }
 
@@ -1767,7 +1767,7 @@ void MainWindow::on_actionStartCapture_triggered()
 //      return;   /* error in options dialog */
 //  }
 
-    main_ui_->mainStack->setCurrentWidget(packet_splitter_);
+    main_ui_->mainStack->setCurrentWidget(master_split_);
 
     if (global_capture_opts.num_selected == 0) {
         QString err_msg = tr("No Interface Selected");