Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
66e5da21
Commit
66e5da21
authored
Apr 12, 2010
by
kh1
Browse files
Fix typo.
parent
a84b3b52
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/plugins/help/help.pro
View file @
66e5da21
...
...
@@ -24,7 +24,7 @@ HEADERS += \
helpviewer_p
.
h
\
openpagesmanager
.
h
\
openpagesmodel
.
h
\
openpagesswicher
.
h
\
openpagesswi
t
cher
.
h
\
openpageswidget
.
h
\
searchwidget
.
h
\
xbelsupport
.
h
...
...
@@ -44,7 +44,7 @@ SOURCES += \
helpviewer_qwv
.
cpp
\
openpagesmanager
.
cpp
\
openpagesmodel
.
cpp
\
openpagesswicher
.
cpp
\
openpagesswi
t
cher
.
cpp
\
openpageswidget
.
cpp
\
searchwidget
.
cpp
\
xbelsupport
.
cpp
...
...
src/plugins/help/openpagesmanager.cpp
View file @
66e5da21
...
...
@@ -34,7 +34,7 @@
#include "helpmanager.h"
#include "helpviewer.h"
#include "openpagesmodel.h"
#include "openpagesswicher.h"
#include "openpagesswi
t
cher.h"
#include "openpageswidget.h"
#include <QtGui/QApplication>
...
...
@@ -54,7 +54,7 @@ OpenPagesManager::OpenPagesManager(QObject *parent)
,
m_comboBox
(
0
)
,
m_model
(
0
)
,
m_openPagesWidget
(
0
)
,
m_openPagesSwicher
(
0
)
,
m_openPagesSwi
t
cher
(
0
)
{
Q_ASSERT
(
!
m_instance
);
...
...
@@ -74,17 +74,17 @@ OpenPagesManager::OpenPagesManager(QObject *parent)
m_comboBox
->
setMinimumContentsLength
(
40
);
connect
(
m_comboBox
,
SIGNAL
(
activated
(
int
)),
this
,
SLOT
(
setCurrentPage
(
int
)));
m_openPagesSwicher
=
new
OpenPagesSwicher
(
m_model
);
connect
(
m_openPagesSwicher
,
SIGNAL
(
closePage
(
QModelIndex
)),
this
,
m_openPagesSwi
t
cher
=
new
OpenPagesSwi
t
cher
(
m_model
);
connect
(
m_openPagesSwi
t
cher
,
SIGNAL
(
closePage
(
QModelIndex
)),
this
,
SLOT
(
closePage
(
QModelIndex
)));
connect
(
m_openPagesSwicher
,
SIGNAL
(
setCurrentPage
(
QModelIndex
)),
this
,
connect
(
m_openPagesSwi
t
cher
,
SIGNAL
(
setCurrentPage
(
QModelIndex
)),
this
,
SLOT
(
setCurrentPage
(
QModelIndex
)));
}
OpenPagesManager
::~
OpenPagesManager
()
{
m_instance
=
0
;
delete
m_openPagesSwicher
;
delete
m_openPagesSwi
t
cher
;
}
OpenPagesManager
&
OpenPagesManager
::
instance
()
...
...
@@ -168,7 +168,7 @@ void OpenPagesManager::setupInitialPages()
emit
pagesChanged
();
setCurrentPage
(
initialPage
);
m_openPagesSwicher
->
selectCurrentPage
();
m_openPagesSwi
t
cher
->
selectCurrentPage
();
}
// -- public slots
...
...
@@ -246,23 +246,23 @@ void OpenPagesManager::closePagesExcept(const QModelIndex &index)
void
OpenPagesManager
::
gotoNextPage
()
{
if
(
!
m_openPagesSwicher
->
isVisible
())
{
m_openPagesSwicher
->
selectCurrentPage
();
m_openPagesSwicher
->
gotoNextPage
();
if
(
!
m_openPagesSwi
t
cher
->
isVisible
())
{
m_openPagesSwi
t
cher
->
selectCurrentPage
();
m_openPagesSwi
t
cher
->
gotoNextPage
();
showTwicherOrSelectPage
();
}
else
{
m_openPagesSwicher
->
gotoNextPage
();
m_openPagesSwi
t
cher
->
gotoNextPage
();
}
}
void
OpenPagesManager
::
gotoPreviousPage
()
{
if
(
!
m_openPagesSwicher
->
isVisible
())
{
m_openPagesSwicher
->
selectCurrentPage
();
m_openPagesSwicher
->
gotoPreviousPage
();
if
(
!
m_openPagesSwi
t
cher
->
isVisible
())
{
m_openPagesSwi
t
cher
->
selectCurrentPage
();
m_openPagesSwi
t
cher
->
gotoPreviousPage
();
showTwicherOrSelectPage
();
}
else
{
m_openPagesSwicher
->
gotoPreviousPage
();
m_openPagesSwi
t
cher
->
gotoPreviousPage
();
}
}
...
...
@@ -285,10 +285,10 @@ void OpenPagesManager::showTwicherOrSelectPage() const
const
int
width
=
CentralWidget
::
instance
()
->
width
();
const
int
height
=
CentralWidget
::
instance
()
->
height
();
const
QPoint
p
(
CentralWidget
::
instance
()
->
mapToGlobal
(
QPoint
(
0
,
0
)));
m_openPagesSwicher
->
move
((
width
-
m_openPagesSwicher
->
width
())
/
2
+
p
.
x
(),
(
height
-
m_openPagesSwicher
->
height
())
/
2
+
p
.
y
());
m_openPagesSwicher
->
setVisible
(
true
);
m_openPagesSwi
t
cher
->
move
((
width
-
m_openPagesSwi
t
cher
->
width
())
/
2
+
p
.
x
(),
(
height
-
m_openPagesSwi
t
cher
->
height
())
/
2
+
p
.
y
());
m_openPagesSwi
t
cher
->
setVisible
(
true
);
}
else
{
m_openPagesSwicher
->
selectAndHide
();
m_openPagesSwi
t
cher
->
selectAndHide
();
}
}
src/plugins/help/openpagesmanager.h
View file @
66e5da21
...
...
@@ -44,7 +44,7 @@ namespace Help {
class
HelpViewer
;
class
OpenPagesModel
;
class
OpenPagesSwicher
;
class
OpenPagesSwi
t
cher
;
class
OpenPagesWidget
;
class
OpenPagesManager
:
public
QObject
...
...
@@ -89,7 +89,7 @@ private:
QComboBox
*
m_comboBox
;
OpenPagesModel
*
m_model
;
OpenPagesWidget
*
m_openPagesWidget
;
OpenPagesSwicher
*
m_openPagesSwicher
;
OpenPagesSwi
t
cher
*
m_openPagesSwi
t
cher
;
static
OpenPagesManager
*
m_instance
;
};
...
...
src/plugins/help/openpagesswicher.cpp
→
src/plugins/help/openpagesswi
t
cher.cpp
View file @
66e5da21
...
...
@@ -27,7 +27,7 @@
**
**************************************************************************/
#include "openpagesswicher.h"
#include "openpagesswi
t
cher.h"
#include "centralwidget.h"
#include "openpagesmodel.h"
...
...
@@ -43,7 +43,7 @@ const int gMargin = 4;
const
int
gWidth
=
300
;
const
int
gHeight
=
200
;
OpenPagesSwicher
::
OpenPagesSwicher
(
OpenPagesModel
*
model
)
OpenPagesSwi
t
cher
::
OpenPagesSwi
t
cher
(
OpenPagesModel
*
model
)
:
QWidget
(
0
,
Qt
::
Popup
)
,
m_openPagesModel
(
model
)
{
...
...
@@ -63,45 +63,45 @@ OpenPagesSwicher::OpenPagesSwicher(OpenPagesModel *model)
SIGNAL
(
setCurrentPage
(
QModelIndex
)));
}
OpenPagesSwicher
::~
OpenPagesSwicher
()
OpenPagesSwi
t
cher
::~
OpenPagesSwi
t
cher
()
{
}
void
OpenPagesSwicher
::
gotoNextPage
()
void
OpenPagesSwi
t
cher
::
gotoNextPage
()
{
selectPageUpDown
(
-
1
);
}
void
OpenPagesSwicher
::
gotoPreviousPage
()
void
OpenPagesSwi
t
cher
::
gotoPreviousPage
()
{
selectPageUpDown
(
1
);
}
void
OpenPagesSwicher
::
selectAndHide
()
void
OpenPagesSwi
t
cher
::
selectAndHide
()
{
setVisible
(
false
);
emit
setCurrentPage
(
m_openPagesWidget
->
currentIndex
());
}
void
OpenPagesSwicher
::
selectCurrentPage
()
void
OpenPagesSwi
t
cher
::
selectCurrentPage
()
{
m_openPagesWidget
->
selectCurrentPage
();
}
void
OpenPagesSwicher
::
setVisible
(
bool
visible
)
void
OpenPagesSwi
t
cher
::
setVisible
(
bool
visible
)
{
QWidget
::
setVisible
(
visible
);
if
(
visible
)
setFocus
();
}
void
OpenPagesSwicher
::
focusInEvent
(
QFocusEvent
*
event
)
void
OpenPagesSwi
t
cher
::
focusInEvent
(
QFocusEvent
*
event
)
{
Q_UNUSED
(
event
)
m_openPagesWidget
->
setFocus
();
}
bool
OpenPagesSwicher
::
eventFilter
(
QObject
*
object
,
QEvent
*
event
)
bool
OpenPagesSwi
t
cher
::
eventFilter
(
QObject
*
object
,
QEvent
*
event
)
{
if
(
object
==
m_openPagesWidget
)
{
if
(
event
->
type
()
==
QEvent
::
KeyPress
)
{
...
...
@@ -129,7 +129,7 @@ bool OpenPagesSwicher::eventFilter(QObject *object, QEvent *event)
return
QWidget
::
eventFilter
(
object
,
event
);
}
void
OpenPagesSwicher
::
selectPageUpDown
(
int
summand
)
void
OpenPagesSwi
t
cher
::
selectPageUpDown
(
int
summand
)
{
const
int
pageCount
=
m_openPagesModel
->
rowCount
();
if
(
pageCount
<
2
)
...
...
src/plugins/help/openpagesswicher.h
→
src/plugins/help/openpagesswi
t
cher.h
View file @
66e5da21
...
...
@@ -27,8 +27,8 @@
**
**************************************************************************/
#ifndef OPENPAGESSWICHER_H
#define OPENPAGESSWICHER_H
#ifndef OPENPAGESSWI
T
CHER_H
#define OPENPAGESSWI
T
CHER_H
#include <QtGui/QWidget>
...
...
@@ -40,13 +40,13 @@ namespace Help {
class
OpenPagesModel
;
class
OpenPagesWidget
;
class
OpenPagesSwicher
:
public
QWidget
class
OpenPagesSwi
t
cher
:
public
QWidget
{
Q_OBJECT
public:
OpenPagesSwicher
(
OpenPagesModel
*
model
);
~
OpenPagesSwicher
();
OpenPagesSwi
t
cher
(
OpenPagesModel
*
model
);
~
OpenPagesSwi
t
cher
();
void
gotoNextPage
();
void
gotoPreviousPage
();
...
...
@@ -73,4 +73,4 @@ private:
}
// namespace Internal
}
// namespace Help
#endif // OPENPAGESSWICHER_H
#endif // OPENPAGESSWI
T
CHER_H
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment