diff --git a/Telegram/SourceFiles/export/view/export_view_done.cpp b/Telegram/SourceFiles/export/view/export_view_done.cpp deleted file mode 100644 index 9d889b539e89fa..00000000000000 --- a/Telegram/SourceFiles/export/view/export_view_done.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* -This file is part of Telegram Desktop, -the official desktop application for the Telegram messaging service. - -For license and copyright information please follow this link: -https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL -*/ -#include "export/view/export_view_done.h" - -#include "lang/lang_keys.h" -#include "ui/widgets/labels.h" -#include "ui/widgets/buttons.h" -#include "ui/wrap/vertical_layout.h" -#include "platform/platform_specific.h" -#include "styles/style_widgets.h" -#include "styles/style_export.h" -#include "styles/style_boxes.h" - -namespace Export { -namespace View { - -DoneWidget::DoneWidget(QWidget *parent) -: RpWidget(parent) { - setupContent(); -} - -void DoneWidget::setupContent() { - initFooter(); - - const auto content = Ui::CreateChild(this); - - const auto label = content->add( - object_ptr( - content, - "Done! " + textcmdLink(1, "Press here") + " to view your data.", - Ui::FlatLabel::InitType::Rich, - st::defaultFlatLabel), - st::exportSettingPadding); - label->setLink(1, std::make_shared([=] { - _showClicks.fire({}); - })); - - sizeValue( - ) | rpl::start_with_next([=](QSize size) { - content->resizeToWidth(size.width()); - }, lifetime()); -} - -rpl::producer<> DoneWidget::showClicks() const { - return _showClicks.events(); -} - -rpl::producer<> DoneWidget::closeClicks() const { - return _close->clicks(); -} - -void DoneWidget::initFooter() { - const auto buttonsPadding = st::boxButtonPadding; - const auto buttonsHeight = buttonsPadding.top() - + st::defaultBoxButton.height - + buttonsPadding.bottom(); - const auto buttons = Ui::CreateChild( - this, - buttonsHeight); - - sizeValue( - ) | rpl::start_with_next([=](QSize size) { - buttons->resizeToWidth(size.width()); - buttons->moveToLeft(0, size.height() - buttons->height()); - }, lifetime()); - - _close = Ui::CreateChild( - buttons, - langFactory(lng_close), - st::defaultBoxButton); - _close->show(); - - buttons->widthValue( - ) | rpl::start_with_next([=] { - const auto right = st::boxButtonPadding.right(); - const auto top = st::boxButtonPadding.top(); - _close->moveToRight(right, top); - }, _close->lifetime()); -} - -} // namespace View -} // namespace Export diff --git a/Telegram/SourceFiles/export/view/export_view_done.h b/Telegram/SourceFiles/export/view/export_view_done.h deleted file mode 100644 index 2a171aff2123c3..00000000000000 --- a/Telegram/SourceFiles/export/view/export_view_done.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -This file is part of Telegram Desktop, -the official desktop application for the Telegram messaging service. - -For license and copyright information please follow this link: -https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL -*/ -#pragma once - -#include "ui/rp_widget.h" - -namespace Ui { -class RoundButton; -} // namespace Ui - -namespace Export { -namespace View { - -class DoneWidget : public Ui::RpWidget { -public: - DoneWidget(QWidget *parent); - - rpl::producer<> showClicks() const; - rpl::producer<> closeClicks() const; - -private: - void initFooter(); - void setupContent(); - - rpl::event_stream<> _showClicks; - - QPointer _close; - -}; - -} // namespace View -} // namespace Export diff --git a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp index c62393c6f11d07..878efff6194c11 100644 --- a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp +++ b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp @@ -9,7 +9,6 @@ For license and copyright information please follow this link: #include "export/view/export_view_settings.h" #include "export/view/export_view_progress.h" -#include "export/view/export_view_done.h" #include "ui/widgets/labels.h" #include "ui/widgets/separate_panel.h" #include "ui/wrap/padding_wrap.h" @@ -137,26 +136,6 @@ void PanelController::stopExport() { _panel->hideGetDuration(); } -void PanelController::showDone(const QString &path) { - _panel->setTitle(Lang::Viewer(lng_export_title)); - - auto done = base::make_unique_q(_panel.get()); - - done->showClicks( - ) | rpl::start_with_next([=] { - File::ShowInFolder(path); - _panel->hideGetDuration(); - }, done->lifetime()); - - done->closeClicks( - ) | rpl::start_with_next([=] { - _panel->hideGetDuration(); - }, done->lifetime()); - - _panel->showInner(std::move(done)); - _panel->setHideOnDeactivate(false); -} - rpl::producer<> PanelController::closed() const { return _panelCloseEvents.events( ) | rpl::flatten_latest( @@ -175,8 +154,8 @@ void PanelController::updateState(State &&state) { } else if (const auto error = base::get_if(&_state)) { showError(*error); } else if (const auto finished = base::get_if(&_state)) { + _panel->setTitle(Lang::Viewer(lng_export_title)); _panel->setHideOnDeactivate(false); - // showDone(finished->path); } } diff --git a/Telegram/SourceFiles/export/view/export_view_panel_controller.h b/Telegram/SourceFiles/export/view/export_view_panel_controller.h index 63abbdfd982176..074a3e530fde8f 100644 --- a/Telegram/SourceFiles/export/view/export_view_panel_controller.h +++ b/Telegram/SourceFiles/export/view/export_view_panel_controller.h @@ -45,7 +45,6 @@ class PanelController { void updateState(State &&state); void showSettings(); void showProgress(); - void showDone(const QString &path); void showError(const ApiErrorState &error); void showError(const OutputErrorState &error); void showError(const QString &text); diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 02a847dafaeb3a..7a103286bde7b9 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -227,8 +227,6 @@ <(src_loc)/dialogs/dialogs_widget.h <(src_loc)/export/view/export_view_content.cpp <(src_loc)/export/view/export_view_content.h -<(src_loc)/export/view/export_view_done.cpp -<(src_loc)/export/view/export_view_done.h <(src_loc)/export/view/export_view_panel_controller.cpp <(src_loc)/export/view/export_view_panel_controller.h <(src_loc)/export/view/export_view_progress.cpp