mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
redesign SharedFiles, with splitted view for Remote and Local Dirs and added QFrame's for switch to different views.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
400ad9e0bd
commit
13eed1c932
@ -82,7 +82,10 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
|
|||||||
|
|
||||||
connect(ui.checkButton, SIGNAL(clicked()), this, SLOT(forceCheck()));
|
connect(ui.checkButton, SIGNAL(clicked()), this, SLOT(forceCheck()));
|
||||||
|
|
||||||
//connect(ui.frameButton, SIGNAL(toggled(bool)), this, SLOT(showFrame(bool)));
|
connect(ui.localButton, SIGNAL(toggled(bool)), this, SLOT(showFrame(bool)));
|
||||||
|
connect(ui.remoteButton, SIGNAL(toggled(bool)), this, SLOT(showFrameRemote(bool)));
|
||||||
|
connect(ui.splittedButton, SIGNAL(toggled(bool)), this, SLOT(showFrameSplitted(bool)));
|
||||||
|
|
||||||
|
|
||||||
connect( ui.localDirTreeView, SIGNAL( customContextMenuRequested( QPoint ) ),
|
connect( ui.localDirTreeView, SIGNAL( customContextMenuRequested( QPoint ) ),
|
||||||
this, SLOT( sharedDirTreeWidgetContextMenu( QPoint ) ) );
|
this, SLOT( sharedDirTreeWidgetContextMenu( QPoint ) ) );
|
||||||
@ -687,20 +690,46 @@ SharedFilesDialog::tryToAddNewAssotiation()
|
|||||||
|
|
||||||
//============================================================================
|
//============================================================================
|
||||||
/**
|
/**
|
||||||
Toggles the Lokal TreeView on and off, changes toggle button text
|
Toggles the Splitted, Remote and Local View on and off*/
|
||||||
|
|
||||||
void SharedFilesDialog::showFrame(bool show)
|
void SharedFilesDialog::showFrame(bool show)
|
||||||
{
|
{
|
||||||
if (show) {
|
if (show) {
|
||||||
ui.frame->setVisible(true);
|
ui.localframe->setVisible(true);
|
||||||
ui.frameButton->setChecked(true);
|
ui.remoteframe->setVisible(false);
|
||||||
ui.frameButton->setToolTip(tr("Hide Lokal Direrectories"));
|
|
||||||
ui.frameButton->setIcon(QIcon(tr(":images/hide_toolbox_frame.png")));
|
ui.localButton->setChecked(true);
|
||||||
} else {
|
|
||||||
ui.frame->setVisible(false);
|
ui.remoteButton->setChecked(false);
|
||||||
ui.frameButton->setChecked(false);
|
ui.splittedButton->setChecked(false);
|
||||||
ui.frameButton->setToolTip(tr("Show Lokal Directories"));
|
|
||||||
ui.frameButton->setIcon(QIcon(tr(":images/show_toolbox_frame.png")));
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedFilesDialog::showFrameRemote(bool show)
|
||||||
|
{
|
||||||
|
if (show) {
|
||||||
|
ui.remoteframe->setVisible(true);
|
||||||
|
ui.localframe->setVisible(false);
|
||||||
|
|
||||||
|
ui.remoteButton->setChecked(true);
|
||||||
|
ui.localButton->setChecked(false);
|
||||||
|
ui.splittedButton->setChecked(false);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedFilesDialog::showFrameSplitted(bool show)
|
||||||
|
{
|
||||||
|
if (show) {
|
||||||
|
ui.remoteframe->setVisible(true);
|
||||||
|
ui.localframe->setVisible(true);
|
||||||
|
|
||||||
|
ui.splittedButton->setChecked(true);
|
||||||
|
|
||||||
|
ui.localButton->setChecked(false);
|
||||||
|
ui.remoteButton->setChecked(false);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -66,7 +66,10 @@ private slots:
|
|||||||
void sendLinkTo();
|
void sendLinkTo();
|
||||||
void sendremoteLinkTo();
|
void sendremoteLinkTo();
|
||||||
|
|
||||||
//void showFrame(bool show);
|
void showFrame(bool show);
|
||||||
|
void showFrameRemote(bool show);
|
||||||
|
void showFrameSplitted(bool show);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// void recommendfile();
|
// void recommendfile();
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -507,7 +507,7 @@
|
|||||||
<number>6</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="topMargin">
|
<property name="topMargin">
|
||||||
<number>1</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="rightMargin">
|
<property name="rightMargin">
|
||||||
<number>6</number>
|
<number>6</number>
|
||||||
@ -578,6 +578,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<widget class="QTreeView" name="downloadList">
|
<widget class="QTreeView" name="downloadList">
|
||||||
<property name="font">
|
<property name="font">
|
||||||
<font>
|
<font>
|
||||||
|
<family>Arial</family>
|
||||||
<pointsize>9</pointsize>
|
<pointsize>9</pointsize>
|
||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
@ -636,6 +637,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<widget class="QTreeView" name="uploadsList">
|
<widget class="QTreeView" name="uploadsList">
|
||||||
<property name="font">
|
<property name="font">
|
||||||
<font>
|
<font>
|
||||||
|
<family>Arial</family>
|
||||||
<pointsize>9</pointsize>
|
<pointsize>9</pointsize>
|
||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
|
@ -352,6 +352,7 @@
|
|||||||
<file>images/view_calendar_day.png</file>
|
<file>images/view_calendar_day.png</file>
|
||||||
<file>images/view_calendar_week.png</file>
|
<file>images/view_calendar_week.png</file>
|
||||||
<file>images/view_calendar_month.png</file>
|
<file>images/view_calendar_month.png</file>
|
||||||
|
<file>images/view_split_top_bottom.png</file>
|
||||||
<file>images/window_fullscreen.png</file>
|
<file>images/window_fullscreen.png</file>
|
||||||
<file>images/window_nofullscreen.png</file>
|
<file>images/window_nofullscreen.png</file>
|
||||||
<file>layouts/default.ui</file>
|
<file>layouts/default.ui</file>
|
||||||
|
BIN
retroshare-gui/src/gui/images/view_split_top_bottom.png
Normal file
BIN
retroshare-gui/src/gui/images/view_split_top_bottom.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 422 B |
Loading…
Reference in New Issue
Block a user