summaryrefslogtreecommitdiff
path: root/src/bookmarks/bookmarkspanel.h
diff options
context:
space:
mode:
authorYoann Laissus <yoann.laissus@gmail.com>2010-03-27 19:04:11 +0100
committerYoann Laissus <yoann.laissus@gmail.com>2010-03-27 19:04:11 +0100
commit632389517ca496031bb1cbe468d904884961bf57 (patch)
treef0be57644d5ceea2bd38c4f7aea8f1808ee9ba78 /src/bookmarks/bookmarkspanel.h
parentAdd tests for the bookmark before toGroup() (diff)
downloadrekonq-632389517ca496031bb1cbe468d904884961bf57.tar.xz
- Fix a crash when the cancel button of the add bookmark menu is clicked
- Use the same behaviour for delete bookmark as the toolbar - Some strings changed - Keep the selection of a folder when it's expanded/collapsed - Fix the name of some methods and properties - Code cleaned a bit
Diffstat (limited to 'src/bookmarks/bookmarkspanel.h')
-rw-r--r--src/bookmarks/bookmarkspanel.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index ea33e265..be52804f 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -40,7 +40,6 @@
// KDE Includes
#include <KBookmark>
#include <KActionCollection>
-#include <KMenu>
// Forward Declarations
class KUrl;
@@ -58,24 +57,24 @@ public:
signals:
void openUrl(const KUrl &, const Rekonq::OpenType &);
void itemHovered(const QString &);
- void saveExpFinished(const QString &);
- void saveRequested();
+ void saveOnlyRequested();
private slots:
void contextMenuBk(const QPoint &pos);
void contextMenuBkGroup(const QPoint &pos, const bool emptyGroup = false);
void contextMenuBlank(const QPoint &pos);
void deleteBookmark();
- void openAll();
+ void openFolderInTabs();
void editBookmark();
void newBookmark();
void newBookmarkGroup();
void newSeparator();
- void bookmarkPage();
- void autoExpand(const QModelIndex &root = QModelIndex());
void onCollapse(const QModelIndex &index);
void onExpand(const QModelIndex &index);
- void callAutoExpand();
+ void bookmarkCurrentPage();
+ void loadFoldedState(const QModelIndex &root);
+ void loadFoldedState();
+
private:
void setup();
@@ -84,10 +83,8 @@ private:
KBookmark bookmarkForIndex(const QModelIndex &index);
UrlTreeView *m_treeView;
- QStringList m_expList;
- KActionCollection m_ac;
- KMenu *menu;
- bool expandLock;
+ KActionCollection *m_ac;
+ bool m_loadingState;
};
#endif // BOOKMARKSPANEL_H