Skip to content

Commit b8eb609

Browse files
uglideuglide
committed
Merge branch '0.6.0'
2 parents f8a9ffc + 474a3f5 commit b8eb609

File tree

13 files changed

+156
-105
lines changed

13 files changed

+156
-105
lines changed

‎RDM.sln‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
4-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis-desktop-manager", "redis-desktop-manager\redis-desktop-manager.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
5-
EndProject
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\tests.vcxproj", "{6421BDA4-EA17-42E0-8736-77A53CE7A465}"
7-
EndProject
8-
Global
9-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|Win32 = Debug|Win32
11-
Debug|x64 = Debug|x64
12-
Live|Win32 = Live|Win32
13-
Live|x64 = Live|x64
14-
Release|Win32 = Release|Win32
15-
Release|x64 = Release|x64
16-
EndGlobalSection
17-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|Win32.ActiveCfg = Debug|Win32
19-
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|Win32.Build.0 = Debug|Win32
20-
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.ActiveCfg = Debug|Win32
21-
{B12702AD-ABFB-343A-A199-8E24837244A3}.Live|Win32.ActiveCfg = Release|Win32
22-
{B12702AD-ABFB-343A-A199-8E24837244A3}.Live|Win32.Build.0 = Release|Win32
23-
{B12702AD-ABFB-343A-A199-8E24837244A3}.Live|x64.ActiveCfg = Release|Win32
24-
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|Win32.ActiveCfg = Release|Win32
25-
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|Win32.Build.0 = Release|Win32
26-
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.ActiveCfg = Release|Win32
27-
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Debug|Win32.ActiveCfg = Debug|Win32
28-
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Debug|Win32.Build.0 = Debug|Win32
29-
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Debug|x64.ActiveCfg = Debug|Win32
30-
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Live|Win32.ActiveCfg = Release|Win32
31-
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Live|Win32.Build.0 = Release|Win32
32-
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Live|x64.ActiveCfg = Release|Win32
33-
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Release|Win32.ActiveCfg = Release|Win32
34-
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Release|Win32.Build.0 = Release|Win32
35-
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Release|x64.ActiveCfg = Release|Win32
36-
EndGlobalSection
37-
GlobalSection(SolutionProperties) = preSolution
38-
HideSolutionNode = FALSE
39-
EndGlobalSection
40-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2012
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis-desktop-manager", "redis-desktop-manager\redis-desktop-manager.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
5+
EndProject
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\tests.vcxproj", "{6421BDA4-EA17-42E0-8736-77A53CE7A465}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Win32 = Debug|Win32
11+
Debug|x64 = Debug|x64
12+
Live|Win32 = Live|Win32
13+
Live|x64 = Live|x64
14+
Release|Win32 = Release|Win32
15+
Release|x64 = Release|x64
16+
EndGlobalSection
17+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|Win32.ActiveCfg = Debug|Win32
19+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|Win32.Build.0 = Debug|Win32
20+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.ActiveCfg = Debug|Win32
21+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Live|Win32.ActiveCfg = Release|Win32
22+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Live|Win32.Build.0 = Release|Win32
23+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Live|x64.ActiveCfg = Release|Win32
24+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|Win32.ActiveCfg = Release|Win32
25+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|Win32.Build.0 = Release|Win32
26+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.ActiveCfg = Release|Win32
27+
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Debug|Win32.ActiveCfg = Debug|Win32
28+
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Debug|Win32.Build.0 = Debug|Win32
29+
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Debug|x64.ActiveCfg = Debug|Win32
30+
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Live|Win32.ActiveCfg = Release|Win32
31+
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Live|Win32.Build.0 = Release|Win32
32+
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Live|x64.ActiveCfg = Release|Win32
33+
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Release|Win32.ActiveCfg = Release|Win32
34+
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Release|Win32.Build.0 = Release|Win32
35+
{6421BDA4-EA17-42E0-8736-77A53CE7A465}.Release|x64.ActiveCfg = Release|Win32
36+
EndGlobalSection
37+
GlobalSection(SolutionProperties) = preSolution
38+
HideSolutionNode = FALSE
39+
EndGlobalSection
40+
EndGlobal

‎redis-desktop-manager/Info.plist‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
3-
<plist version="0.9">
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
44
<dict>
5-
<key>CFBundleIconFile</key>
6-
<string>rdm.icns</string>
7-
<key>NSPrincipalClass</key>
8-
<string>NSApplication</string>
9-
<key>CFBundleIconFile</key>
10-
<string></string>
11-
<key>CFBundlePackageType</key>
12-
<string>APPL</string>
13-
<key>CFBundleGetInfoString</key>
14-
<string>Created by Qt/QMake</string>
15-
<key>CFBundleSignature</key>
16-
<string>????</string>
17-
<key>CFBundleExecutable</key>
18-
<string>RedisDesktopManager</string>
19-
<key>CFBundleIdentifier</key>
20-
<string>com.redisdesktop.rdm</string>
21-
<key>NOTE</key>
22-
<string>This file was generated by Qt/QMake.</string>
5+
<key>CFBundleDisplayName</key>
6+
<string>Redis Desktop Manager</string>
7+
<key>CFBundleIconFile</key>
8+
<string>rdm.icns</string>
9+
<key>CFBundleVersion</key>
10+
<string>0.5.0</string>
11+
<key>NSPrincipalClass</key>
12+
<string>NSApplication</string>
13+
<key>NSHighResolutionCapable</key>
14+
<true/>
15+
<key>CFBundlePackageType</key>
16+
<string>APPL</string>
17+
<key>CFBundleGetInfoString</key>
18+
<string>Created by Qt/QMake</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleExecutable</key>
22+
<string>rdm</string>
23+
<key>CFBundleIdentifier</key>
24+
<string>com.redisdesktop.rdm</string>
25+
<key>NOTE</key>
26+
<string>This file was generated by Qt/QMake.</string>
2327
</dict>
2428
</plist>

‎redis-desktop-manager/forms/demo.ui‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ aa|bb Either aa or bb.
319319
<property name="minimumSize">
320320
<size>
321321
<width>580</width>
322-
<height>240</height>
322+
<height>255</height>
323323
</size>
324324
</property>
325325
<widget class="QLabel" name="applicationInfoLabel">
@@ -394,7 +394,7 @@ aa|bb Either aa or bb.
394394
<property name="geometry">
395395
<rect>
396396
<x>20</x>
397-
<y>200</y>
397+
<y>210</y>
398398
<width>531</width>
399399
<height>21</height>
400400
</rect>
@@ -451,7 +451,7 @@ aa|bb Either aa or bb.
451451
<x>20</x>
452452
<y>170</y>
453453
<width>531</width>
454-
<height>21</height>
454+
<height>31</height>
455455
</rect>
456456
</property>
457457
<property name="sizePolicy">
@@ -462,7 +462,12 @@ aa|bb Either aa or bb.
462462
</property>
463463
<property name="text">
464464
<string>&lt;style&gt;a {color: darkblue; text-decoration: none}&lt;/style&gt;
465-
&lt;p&gt;&lt;b&gt;Thanks to:&amp;nbsp;&amp;nbsp;&lt;/b&gt;&lt;a href=&quot;https://github.com/stalker-druid/&quot;&gt;Alexander Arshinov&lt;/a&gt;, &lt;a href=&quot;https://github.com/loginwashere&quot;&gt;Dmitriy Savchenko&lt;/a&gt;, &lt;a href=&quot;https://github.com/Dyachenko&quot;&gt;Yevgeniy Dyachenko&lt;/a&gt;&lt;/p&gt;</string>
465+
&lt;p&gt;&lt;b&gt;Thanks to:&amp;nbsp;&amp;nbsp;&lt;/b&gt;&lt;a href=&quot;https://github.com/stalker-druid/&quot;&gt;Alexander Arshinov&lt;/a&gt;, &lt;a href=&quot;https://github.com/loginwashere&quot;&gt;Dmitriy Savchenko&lt;/a&gt;,
466+
&lt;a href=&quot;https://github.com/Dyachenko&quot;&gt;Yevgeniy Dyachenko&lt;/a&gt;,
467+
&lt;a href=&quot;https://github.com/AntonShevchuk&quot;&gt;Anton Shevchuk&lt;/a&gt;,
468+
&lt;a href=&quot;https://github.com/leonko&quot;&gt;Leonid Batizhevsky&lt;/a&gt;,
469+
&lt;a href=&quot;https://github.com/mrThe&quot;&gt;mrThe&lt;/a&gt;
470+
&lt;/p&gt;</string>
466471
</property>
467472
<property name="scaledContents">
468473
<bool>true</bool>

‎redis-desktop-manager/include/demo.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class MainWin : public QMainWindow
4949
void OnTabClose(int index);
5050
void OnTreeViewContextMenu(const QPoint &);
5151
void OnReloadServerInTree();
52+
void OnDisconnectFromServer();
5253
void OnNewUpdateAvailable(QString &);
5354
void OnRemoveConnectionFromTree();
5455
void OnEditConnection();

‎redis-desktop-manager/include/redis/Response.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Response
4141
QStringList parseMultiBulk(QString response);
4242
QString getStringResponse(QString response);
4343

44-
int getSizeOfBulkReply(QString&, int);
44+
int getSizeOfBulkReply(QString& reply, int endOfFirstLine = -1, int beginFrom = 0);
4545

4646
//validations
4747
bool isReplyValid(QString&);
@@ -51,5 +51,7 @@ class Response
5151
bool isIntReplyValid(QString&);
5252
bool isBulkReplyValid(QString&);
5353
bool isMultiBulkReplyValid(QString&);
54+
55+
int getPosOfNextItem(QString &, int);
5456
};
5557

‎redis-desktop-manager/redis-desktop-manager.rc‎

0 Bytes
Binary file not shown.

‎redis-desktop-manager/source/connection.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ connection::connection(QWidget *parent, RedisServerItem * srv)
1919

2020
// connect slots to signals
2121
connect(ui.okButton, SIGNAL(clicked()), SLOT(OnOkButtonClick()));
22-
connect(ui.okButton, SIGNAL(pressed()), SLOT(OnOkButtonClick()));
22+
connect(ui.okButton, SIGNAL(pressed()), SLOT(clicked()));
2323

2424
//edit mode
2525
if (srv != nullptr) {

‎redis-desktop-manager/source/demo.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ void MainWin::OnTreeViewContextMenu(const QPoint &point)
270270
menu->addSeparator();
271271
menu->addAction(QIcon(":/images/serverinfo.png"), "Server info", this, SLOT(OnServerInfoOpen()));
272272
menu->addAction(QIcon(":/images/refreshdb.png"), "Reload", this, SLOT(OnReloadServerInTree()));
273+
menu->addAction(QIcon(":/images/redisIcon_offline.png"), "Disconnect", this, SLOT(OnDisconnectFromServer()));
273274
menu->addSeparator();
274275
menu->addAction(QIcon(":/images/editdb.png"), "Edit", this, SLOT(OnEditConnection()));
275276
menu->addAction(QIcon(":/images/delete.png"), "Delete", this, SLOT(OnRemoveConnectionFromTree()));
@@ -288,6 +289,17 @@ void MainWin::OnReloadServerInTree()
288289
server->reload();
289290
}
290291

292+
void MainWin::OnDisconnectFromServer()
293+
{
294+
QStandardItem * item = getSelectedItemInConnectionsTree();
295+
296+
if (item == nullptr || item->type() != RedisServerItem::TYPE)
297+
return;
298+
299+
RedisServerItem * server = (RedisServerItem *) item;
300+
server->unload();
301+
}
302+
291303
void MainWin::OnRemoveConnectionFromTree()
292304
{
293305
QStandardItem * item = getSelectedItemInConnectionsTree();

‎redis-desktop-manager/source/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
66
QApplication a(argc, argv);
77

88
QApplication::setApplicationName("Redis Desktop Manager");
9-
QApplication::setApplicationVersion("0.5.0");
9+
QApplication::setApplicationVersion("0.5.1");
1010
QApplication::setOrganizationDomain("redisdesktop.com");
1111

1212
MainWin w;

‎redis-desktop-manager/source/models/items/RedisServerItem.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ void RedisServerItem::unload()
101101
isDbInfoLoaded = false;
102102

103103
getItemNameFromConnection();
104+
105+
setOfflineIcon();
104106
}
105107

106108

0 commit comments

Comments
 (0)