procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve suggest export logic.

This commit is contained in:
John Preston 2018-06-28 18:44:07 +01:00
parent d0614efd65
commit e21c354428
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/data/data_session.cpp
View File

@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "history/view/history_view_element.h" #include "history/view/history_view_element.h"
#include "inline_bots/inline_bot_layout_item.h" #include "inline_bots/inline_bot_layout_item.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "boxes/abstract_box.h"
#include "data/data_media_types.h" #include "data/data_media_types.h"
#include "data/data_feed.h" #include "data/data_feed.h"
#include "data/data_photo.h" #include "data/data_photo.h"
@ -93,6 +94,13 @@ void Session::suggestStartExport(TimeId availableAt) {
suggestStartExport(); suggestStartExport();
} }
void Session::clearExportSuggestion() {
_exportAvailableAt = 0;
if (_exportSuggestion) {
_exportSuggestion->closeBox();
}
}
void Session::suggestStartExport() { void Session::suggestStartExport() {
if (_exportAvailableAt <= 0) { if (_exportAvailableAt <= 0) {
return; return;
@ -110,7 +118,7 @@ void Session::suggestStartExport() {
} else if (_export) { } else if (_export) {
Export::View::ClearSuggestStart(); Export::View::ClearSuggestStart();
} else { } else {
Export::View::SuggestStart(); _exportSuggestion = Export::View::SuggestStart();
} }
} }

3
Telegram/SourceFiles/data/data_session.h
View File

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/timer.h" #include "base/timer.h"
class HistoryItem; class HistoryItem;
class BoxContent;
namespace HistoryView { namespace HistoryView {
struct Group; struct Group;
@ -53,6 +54,7 @@ public:
void startExport(); void startExport();
void suggestStartExport(TimeId availableAt); void suggestStartExport(TimeId availableAt);
void clearExportSuggestion();
rpl::producer<Export::View::PanelController*> currentExportView() const; rpl::producer<Export::View::PanelController*> currentExportView() const;
bool exportInProgress() const; bool exportInProgress() const;
void stopExportWithConfirmation(FnMut<void()> callback); void stopExportWithConfirmation(FnMut<void()> callback);
@ -509,6 +511,7 @@ private:
std::unique_ptr<Export::View::PanelController> _exportPanel; std::unique_ptr<Export::View::PanelController> _exportPanel;
rpl::event_stream<Export::View::PanelController*> _exportViewChanges; rpl::event_stream<Export::View::PanelController*> _exportViewChanges;
TimeId _exportAvailableAt = 0; TimeId _exportAvailableAt = 0;
QPointer<BoxContent> _exportSuggestion;
base::Variable<bool> _contactsLoaded = { false }; base::Variable<bool> _contactsLoaded = { false };
base::Variable<bool> _allChatsLoaded = { false }; base::Variable<bool> _allChatsLoaded = { false };

6
Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
View File

@ -90,12 +90,14 @@ Environment PrepareEnvironment() {
} // namespace } // namespace
void SuggestStart() { QPointer<BoxContent> SuggestStart() {
ClearSuggestStart(); ClearSuggestStart();
Ui::show(Box<SuggestBox>(), LayerOption::KeepOther); return Ui::show(Box<SuggestBox>(), LayerOption::KeepOther).data();
} }
void ClearSuggestStart() { void ClearSuggestStart() {
Auth().data().clearExportSuggestion();
auto settings = Local::ReadExportSettings(); auto settings = Local::ReadExportSettings();
if (settings.availableAt) { if (settings.availableAt) {
settings.availableAt = 0; settings.availableAt = 0;

2
Telegram/SourceFiles/export/view/export_view_panel_controller.h
View File

@ -21,7 +21,7 @@ class SeparatePanel;
namespace Export { namespace Export {
namespace View { namespace View {
void SuggestStart(); QPointer<BoxContent> SuggestStart();
void ClearSuggestStart(); void ClearSuggestStart();
class Panel; class Panel;