VBox

Timestamp:

Aug 21, 2023 5:59:51 AM (19 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158854

Message:

FE/Qt: bugref:10496, bugref:9072. Build fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.cpp

-              r100907
+              r100917
         return;
     m_pTabWidget->setCurrentIndex(iIndex);
+}
+int UIDialogPanelBase::currentIndex() const
+{
+    if (!m_pTabWidget)
+        return -1;
+    return m_pTabWidget->currentIndex();
+}

r100907	r100917
56	56	UIDialogPanelBase(QWidget *pParent = 0);
57	57	void setCurrentIndex(int iIndex);
	58	int currentIndex() const;
58	59
59	60	protected:

-              r100915
+              r100917
 #endif
+/* Other VBox includes: */
+#include <iprt/assert.h>
 /*********************************************************************************************************************************

r100915	r100917
51	51	void UIVMLogViewerPanelNew::prepare()
52	52	{
53		prepareSearchTab();
	53	m_pSearchWidget = new UIVMLogViewerSearchPanel(0, m_pViewer);
	54	insertTab(0, m_pSearchWidget);
54	55	retranslateUi();
55	56	}
56	57
57		void UIVMLogViewerPanelNew::~~prepareSearchTab~~()
	58	void UIVMLogViewerPanelNew::refreshSearch()
58	59	{
59		//insertTab(0, new QPushButton("asdasda"));
60		m_pSearchWidget = new UIVMLogViewerSearchPanel(0, m_pViewer);
61		insertTab(0, m_pSearchWidget);
	60	if (m_pSearchWidget)
	61	m_pSearchWidget->refreshSearch();
62	62	}
63	63

-              r100916
+              r100917
     UIVMLogViewerPanelNew(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+    void refreshSearch();
+    enum Page
+    {
+        Page_Search = 0,
+        Page_Filter,
+        Page_Bookmark,
+        Page_Preferences,
+        Page_Max
+    };
 private:
 …
     void retranslateUi() override;
     void prepare() override;
-    void prepareSearchTab();
     UIVMLogViewerSearchPanel *m_pSearchWidget;

r100915	r100917
68	68	}
69	69
70		void UIVMLogViewerSearchPanel::refresh()
	70	void UIVMLogViewerSearchPanel::refreshSearch()
71	71	{
72	72	/* We start the search from the end of the doc. assuming log's end is more interesting: */
…	…
172	172	void UIVMLogViewerSearchPanel::sltCaseSentitiveCheckBox()
173	173	{
174		refresh();
	174	refreshSearch();
175	175	}
176	176
177	177	void UIVMLogViewerSearchPanel::sltMatchWholeWordCheckBox()
178	178	{
179		refresh();
	179	refreshSearch();
180	180	}
181	181

r100915	r100917
64	64	UIVMLogViewerSearchPanel(QWidget pParent, UIVMLogViewerWidget pViewer);
65	65	/** Resets the search position and starts a new search. */
66		void refresh();
	66	void refreshSearch();
67	67	const QVector<float> &matchLocationVector() const;
68	68	/** Returns the number of the matches to the current search. */

Note: See TracChangeset for help on using the changeset viewer.