Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Graphics
Okular
Commits
b32d8153
Commit
b32d8153
authored
Aug 10, 2014
by
Frederik Gladhorn
Browse files
A few action and include fixes
parent
96b0e27c
Changes
5
Hide whitespace changes
Inline
Side-by-side
ui/annotationwidgets.cpp
View file @
b32d8153
...
...
@@ -659,7 +659,7 @@ QWidget * FileAttachmentAnnotationWidget::createExtraWidget()
Okular
::
EmbeddedFile
*
ef
=
m_attachAnn
->
embeddedFile
();
const
int
size
=
ef
->
size
();
const
QString
sizeString
=
size
<=
0
?
i18nc
(
"Not available size"
,
"N/A"
)
:
K
Glob
al
::
lo
c
al
e
()
->
formatByteSize
(
size
);
const
QString
sizeString
=
size
<=
0
?
i18nc
(
"Not available size"
,
"N/A"
)
:
K
Loc
al
e
::
g
lo
b
al
()
->
formatByteSize
(
size
);
const
QString
descString
=
ef
->
description
().
isEmpty
()
?
i18n
(
"No description available."
)
:
ef
->
description
();
QGridLayout
*
lay
=
new
QGridLayout
(
widget
);
...
...
ui/annotwindow.cpp
View file @
b32d8153
...
...
@@ -301,8 +301,8 @@ void AnnotWindow::slotUpdateUndoAndRedoInContextMenu(QMenu* menu)
QList
<
QAction
*>
actionList
=
menu
->
actions
();
enum
{
UndoAct
,
RedoAct
,
CutAct
,
CopyAct
,
PasteAct
,
ClearAct
,
SelectAllAct
,
NCountActs
};
K
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_document
,
SLOT
(
undo
()),
menu
);
K
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_document
,
SLOT
(
redo
()),
menu
);
Q
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_document
,
SLOT
(
undo
()),
menu
);
Q
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_document
,
SLOT
(
redo
()),
menu
);
connect
(
m_document
,
SIGNAL
(
canUndoChanged
(
bool
)),
kundo
,
SLOT
(
setEnabled
(
bool
)));
connect
(
m_document
,
SIGNAL
(
canRedoChanged
(
bool
)),
kredo
,
SLOT
(
setEnabled
(
bool
)));
kundo
->
setEnabled
(
m_document
->
canUndo
());
...
...
ui/fileprinterpreview.cpp
View file @
b32d8153
...
...
@@ -18,6 +18,7 @@
#include
<QtWidgets/QLabel>
#include
<QtGui/QShowEvent>
#include
<klocalizedstring.h>
#include
<kmimetypetrader.h>
#include
<kparts/readonlypart.h>
#include
<kpluginfactory.h>
...
...
ui/formwidgets.cpp
View file @
b32d8153
...
...
@@ -18,6 +18,7 @@
#include
<klocale.h>
#include
<kstandardaction.h>
#include
<kaction.h>
#include
<kurl.h>
// local includes
#include
"core/form.h"
...
...
@@ -440,8 +441,8 @@ void FormLineEdit::contextMenuEvent( QContextMenuEvent* event )
QList
<
QAction
*>
actionList
=
menu
->
actions
();
enum
{
UndoAct
,
RedoAct
,
CutAct
,
CopyAct
,
PasteAct
,
DeleteAct
,
SelectAllAct
};
K
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_controller
,
SIGNAL
(
requestUndo
()
),
menu
);
K
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_controller
,
SIGNAL
(
requestRedo
()
),
menu
);
Q
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_controller
,
SIGNAL
(
requestUndo
()
),
menu
);
Q
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_controller
,
SIGNAL
(
requestRedo
()
),
menu
);
connect
(
m_controller
,
SIGNAL
(
canUndoChanged
(
bool
)
),
kundo
,
SLOT
(
setEnabled
(
bool
)
)
);
connect
(
m_controller
,
SIGNAL
(
canRedoChanged
(
bool
)
),
kredo
,
SLOT
(
setEnabled
(
bool
)
)
);
kundo
->
setEnabled
(
m_controller
->
canUndo
()
);
...
...
@@ -554,8 +555,8 @@ void TextAreaEdit::slotUpdateUndoAndRedoInContextMenu( QMenu* menu )
QList
<
QAction
*>
actionList
=
menu
->
actions
();
enum
{
UndoAct
,
RedoAct
,
CutAct
,
CopyAct
,
PasteAct
,
ClearAct
,
SelectAllAct
,
NCountActs
};
K
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_controller
,
SIGNAL
(
requestUndo
()
),
menu
);
K
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_controller
,
SIGNAL
(
requestRedo
()
),
menu
);
Q
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_controller
,
SIGNAL
(
requestUndo
()
),
menu
);
Q
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_controller
,
SIGNAL
(
requestRedo
()
),
menu
);
connect
(
m_controller
,
SIGNAL
(
canUndoChanged
(
bool
)
),
kundo
,
SLOT
(
setEnabled
(
bool
)
)
);
connect
(
m_controller
,
SIGNAL
(
canRedoChanged
(
bool
)
),
kredo
,
SLOT
(
setEnabled
(
bool
)
)
);
kundo
->
setEnabled
(
m_controller
->
canUndo
()
);
...
...
@@ -670,8 +671,8 @@ bool FileEdit::eventFilter( QObject* obj, QEvent* event )
QList
<
QAction
*
>
actionList
=
menu
->
actions
();
enum
{
UndoAct
,
RedoAct
,
CutAct
,
CopyAct
,
PasteAct
,
DeleteAct
,
SelectAllAct
};
K
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_controller
,
SIGNAL
(
requestUndo
()
),
menu
);
K
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_controller
,
SIGNAL
(
requestRedo
()
),
menu
);
Q
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_controller
,
SIGNAL
(
requestUndo
()
),
menu
);
Q
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_controller
,
SIGNAL
(
requestRedo
()
),
menu
);
connect
(
m_controller
,
SIGNAL
(
canUndoChanged
(
bool
)
),
kundo
,
SLOT
(
setEnabled
(
bool
)
)
);
connect
(
m_controller
,
SIGNAL
(
canRedoChanged
(
bool
)
),
kredo
,
SLOT
(
setEnabled
(
bool
)
)
);
kundo
->
setEnabled
(
m_controller
->
canUndo
()
);
...
...
@@ -933,8 +934,8 @@ void ComboEdit::contextMenuEvent( QContextMenuEvent* event )
QList
<
QAction
*>
actionList
=
menu
->
actions
();
enum
{
UndoAct
,
RedoAct
,
CutAct
,
CopyAct
,
PasteAct
,
DeleteAct
,
SelectAllAct
};
K
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_controller
,
SIGNAL
(
requestUndo
()
),
menu
);
K
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_controller
,
SIGNAL
(
requestRedo
()
),
menu
);
Q
Action
*
kundo
=
KStandardAction
::
create
(
KStandardAction
::
Undo
,
m_controller
,
SIGNAL
(
requestUndo
()
),
menu
);
Q
Action
*
kredo
=
KStandardAction
::
create
(
KStandardAction
::
Redo
,
m_controller
,
SIGNAL
(
requestRedo
()
),
menu
);
connect
(
m_controller
,
SIGNAL
(
canUndoChanged
(
bool
)
),
kundo
,
SLOT
(
setEnabled
(
bool
)
)
);
connect
(
m_controller
,
SIGNAL
(
canRedoChanged
(
bool
)
),
kredo
,
SLOT
(
setEnabled
(
bool
)
)
);
kundo
->
setEnabled
(
m_controller
->
canUndo
()
);
...
...
ui/minibar.cpp
View file @
b32d8153
...
...
@@ -22,6 +22,7 @@
#include
<QtWidgets/QToolButton>
#include
<qvalidator.h>
#include
<qpainter.h>
#include
<kglobalsettings.h>
#include
<kicon.h>
#include
<kicontheme.h>
#include
<klineedit.h>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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