mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-07 06:02:41 -04:00
Merged branch for GUI improvements into trunk. The improvement phase is not finsihed yet. The work on GUI will continue into trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
c23cfd4a0f
commit
50db473329
46 changed files with 2536 additions and 2984 deletions
|
@ -59,7 +59,7 @@ public slots:
|
|||
void insertConnect();
|
||||
// std::string loadneighbour();
|
||||
/* void loadneighbour(); */
|
||||
void updateNewDiscoveryInfo() ;
|
||||
//void updateNewDiscoveryInfo() ;
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
|
@ -87,17 +87,17 @@ private slots:
|
|||
|
||||
void on_actionCreate_New_Profile_activated();
|
||||
|
||||
void updateNetworkStatus();
|
||||
//void updateNetworkStatus();
|
||||
|
||||
void loadtabsettings();
|
||||
// void loadtabsettings();
|
||||
|
||||
void on_actionTabsright_activated();
|
||||
void on_actionTabsnorth_activated();
|
||||
void on_actionTabssouth_activated();
|
||||
void on_actionTabswest_activated();
|
||||
|
||||
void on_actionTabsRounded_activated();
|
||||
void on_actionTabsTriangular_activated();
|
||||
// void on_actionTabsright_activated();
|
||||
// void on_actionTabsnorth_activated();
|
||||
// void on_actionTabssouth_activated();
|
||||
// void on_actionTabswest_activated();
|
||||
//
|
||||
// void on_actionTabsRounded_activated();
|
||||
// void on_actionTabsTriangular_activated();
|
||||
|
||||
void filterColumnChanged(int);
|
||||
void filterItems(const QString &text);
|
||||
|
@ -107,7 +107,7 @@ private:
|
|||
|
||||
QTreeWidget *connecttreeWidget;
|
||||
|
||||
class NetworkView *networkview;
|
||||
// class NetworkView *networkview;
|
||||
|
||||
bool filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue