Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
74eca077
Kaydet (Commit)
74eca077
authored
Nis 11, 2013
tarafından
Bjoern Michaelsen
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
some more debug info
Change-Id: Icabdaab665ac969c9ba6240d2e825d1e62776249
üst
58b7dd8a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
0 deletions
+16
-0
gloactiongroup.cxx
vcl/unx/gtk/window/gloactiongroup.cxx
+11
-0
gtksalframe.cxx
vcl/unx/gtk/window/gtksalframe.cxx
+1
-0
gtksalmenu.cxx
vcl/unx/gtk/window/gtksalmenu.cxx
+4
-0
No files found.
vcl/unx/gtk/window/gloactiongroup.cxx
Dosyayı görüntüle @
74eca077
...
@@ -135,6 +135,7 @@ g_lo_action_group_query_action (GActionGroup *group,
...
@@ -135,6 +135,7 @@ g_lo_action_group_query_action (GActionGroup *group,
GVariant
**
state_hint
,
GVariant
**
state_hint
,
GVariant
**
state
)
GVariant
**
state
)
{
{
//SAL_INFO("vcl.unity", "g_lo_action_group_query_action on " << group);
GLOActionGroup
*
lo_group
=
G_LO_ACTION_GROUP
(
group
);
GLOActionGroup
*
lo_group
=
G_LO_ACTION_GROUP
(
group
);
GLOAction
*
action
;
GLOAction
*
action
;
...
@@ -166,6 +167,8 @@ g_lo_action_group_perform_submenu_action (GLOActionGroup *group,
...
@@ -166,6 +167,8 @@ g_lo_action_group_perform_submenu_action (GLOActionGroup *group,
const
gchar
*
action_name
,
const
gchar
*
action_name
,
GVariant
*
state
)
GVariant
*
state
)
{
{
SAL_INFO
(
"vcl.unity"
,
"g_lo_action_group_perform_submenu_action on "
<<
group
);
GtkSalFrame
*
pFrame
=
group
->
priv
->
frame
;
GtkSalFrame
*
pFrame
=
group
->
priv
->
frame
;
if
(
pFrame
==
NULL
)
if
(
pFrame
==
NULL
)
...
@@ -188,6 +191,7 @@ g_lo_action_group_change_state (GActionGroup *group,
...
@@ -188,6 +191,7 @@ g_lo_action_group_change_state (GActionGroup *group,
const
gchar
*
action_name
,
const
gchar
*
action_name
,
GVariant
*
value
)
GVariant
*
value
)
{
{
SAL_INFO
(
"vcl.unity"
,
"g_lo_action_group_perform_submenu_action on "
<<
group
);
g_return_if_fail
(
value
!=
NULL
);
g_return_if_fail
(
value
!=
NULL
);
g_variant_ref_sink
(
value
);
g_variant_ref_sink
(
value
);
...
@@ -239,6 +243,7 @@ g_lo_action_group_activate (GActionGroup *group,
...
@@ -239,6 +243,7 @@ g_lo_action_group_activate (GActionGroup *group,
{
{
GLOActionGroup
*
lo_group
=
G_LO_ACTION_GROUP
(
group
);
GLOActionGroup
*
lo_group
=
G_LO_ACTION_GROUP
(
group
);
GtkSalFrame
*
pFrame
=
lo_group
->
priv
->
frame
;
GtkSalFrame
*
pFrame
=
lo_group
->
priv
->
frame
;
SAL_INFO
(
"vcl.unity"
,
"g_lo_action_group_activate on group "
<<
group
<<
" for frame "
<<
pFrame
<<
" with parameter "
<<
parameter
);
if
(
parameter
!=
NULL
)
if
(
parameter
!=
NULL
)
g_action_group_change_action_state
(
group
,
action_name
,
parameter
);
g_action_group_change_action_state
(
group
,
action_name
,
parameter
);
...
@@ -246,10 +251,12 @@ g_lo_action_group_activate (GActionGroup *group,
...
@@ -246,10 +251,12 @@ g_lo_action_group_activate (GActionGroup *group,
if
(
pFrame
!=
NULL
)
if
(
pFrame
!=
NULL
)
{
{
GtkSalMenu
*
pSalMenu
=
static_cast
<
GtkSalMenu
*
>
(
pFrame
->
GetMenu
()
);
GtkSalMenu
*
pSalMenu
=
static_cast
<
GtkSalMenu
*
>
(
pFrame
->
GetMenu
()
);
SAL_INFO
(
"vcl.unity"
,
"g_lo_action_group_activate for menu "
<<
pSalMenu
);
if
(
pSalMenu
!=
NULL
)
if
(
pSalMenu
!=
NULL
)
{
{
GLOAction
*
action
=
G_LO_ACTION
(
g_hash_table_lookup
(
lo_group
->
priv
->
table
,
action_name
));
GLOAction
*
action
=
G_LO_ACTION
(
g_hash_table_lookup
(
lo_group
->
priv
->
table
,
action_name
));
SAL_INFO
(
"vcl.unity"
,
"g_lo_action_group_activate dispatching action "
<<
action
<<
" named "
<<
action_name
<<
" on menu "
<<
pSalMenu
);
pSalMenu
->
DispatchCommand
(
action
->
item_id
,
action_name
);
pSalMenu
->
DispatchCommand
(
action
->
item_id
,
action_name
);
}
}
}
}
...
@@ -320,6 +327,7 @@ g_lo_action_group_finalize (GObject *object)
...
@@ -320,6 +327,7 @@ g_lo_action_group_finalize (GObject *object)
static
void
static
void
g_lo_action_group_init
(
GLOActionGroup
*
group
)
g_lo_action_group_init
(
GLOActionGroup
*
group
)
{
{
SAL_INFO
(
"vcl.unity"
,
"g_lo_action_group_init on "
<<
group
);
group
->
priv
=
G_TYPE_INSTANCE_GET_PRIVATE
(
group
,
group
->
priv
=
G_TYPE_INSTANCE_GET_PRIVATE
(
group
,
G_TYPE_LO_ACTION_GROUP
,
G_TYPE_LO_ACTION_GROUP
,
GLOActionGroupPrivate
);
GLOActionGroupPrivate
);
...
@@ -361,6 +369,7 @@ g_lo_action_group_set_action_enabled (GLOActionGroup *group,
...
@@ -361,6 +369,7 @@ g_lo_action_group_set_action_enabled (GLOActionGroup *group,
const
gchar
*
action_name
,
const
gchar
*
action_name
,
gboolean
enabled
)
gboolean
enabled
)
{
{
SAL_INFO
(
"vcl.unity"
,
"g_lo_action_group_set_action_enabled on "
<<
group
);
g_return_if_fail
(
G_IS_LO_ACTION_GROUP
(
group
));
g_return_if_fail
(
G_IS_LO_ACTION_GROUP
(
group
));
g_return_if_fail
(
action_name
!=
NULL
);
g_return_if_fail
(
action_name
!=
NULL
);
...
@@ -378,6 +387,7 @@ void
...
@@ -378,6 +387,7 @@ void
g_lo_action_group_remove
(
GLOActionGroup
*
group
,
g_lo_action_group_remove
(
GLOActionGroup
*
group
,
const
gchar
*
action_name
)
const
gchar
*
action_name
)
{
{
SAL_INFO
(
"vcl.unity"
,
"g_lo_action_group_remove on "
<<
group
);
g_return_if_fail
(
G_IS_LO_ACTION_GROUP
(
group
));
g_return_if_fail
(
G_IS_LO_ACTION_GROUP
(
group
));
if
(
action_name
!=
NULL
)
if
(
action_name
!=
NULL
)
...
@@ -390,6 +400,7 @@ g_lo_action_group_remove (GLOActionGroup *group,
...
@@ -390,6 +400,7 @@ g_lo_action_group_remove (GLOActionGroup *group,
void
void
g_lo_action_group_clear
(
GLOActionGroup
*
group
)
g_lo_action_group_clear
(
GLOActionGroup
*
group
)
{
{
SAL_INFO
(
"vcl.unity"
,
"g_lo_action_group_clear on "
<<
group
);
g_return_if_fail
(
G_IS_LO_ACTION_GROUP
(
group
));
g_return_if_fail
(
G_IS_LO_ACTION_GROUP
(
group
));
GList
*
keys
=
g_hash_table_get_keys
(
group
->
priv
->
table
);
GList
*
keys
=
g_hash_table_get_keys
(
group
->
priv
->
table
);
...
...
vcl/unx/gtk/window/gtksalframe.cxx
Dosyayı görüntüle @
74eca077
...
@@ -569,6 +569,7 @@ gboolean ensure_dbus_setup( gpointer data )
...
@@ -569,6 +569,7 @@ gboolean ensure_dbus_setup( gpointer data )
// Publish the menu model and the action group.
// Publish the menu model and the action group.
SAL_INFO
(
"vcl.unity"
,
"exporting menu model at "
<<
pMenuModel
<<
" for window "
<<
windowId
);
SAL_INFO
(
"vcl.unity"
,
"exporting menu model at "
<<
pMenuModel
<<
" for window "
<<
windowId
);
pSalFrame
->
m_nMenuExportId
=
g_dbus_connection_export_menu_model
(
pSessionBus
,
aDBusMenubarPath
,
pMenuModel
,
NULL
);
pSalFrame
->
m_nMenuExportId
=
g_dbus_connection_export_menu_model
(
pSessionBus
,
aDBusMenubarPath
,
pMenuModel
,
NULL
);
SAL_INFO
(
"vcl.unity"
,
"exporting action group at "
<<
pActionGroup
<<
" for window "
<<
windowId
);
pSalFrame
->
m_nActionGroupExportId
=
g_dbus_connection_export_action_group
(
pSessionBus
,
aDBusPath
,
pActionGroup
,
NULL
);
pSalFrame
->
m_nActionGroupExportId
=
g_dbus_connection_export_action_group
(
pSessionBus
,
aDBusPath
,
pActionGroup
,
NULL
);
pSalFrame
->
m_nHudAwarenessId
=
hud_awareness_register
(
pSessionBus
,
aDBusMenubarPath
,
hud_activated
,
pSalFrame
,
NULL
,
NULL
);
pSalFrame
->
m_nHudAwarenessId
=
hud_awareness_register
(
pSessionBus
,
aDBusMenubarPath
,
hud_activated
,
pSalFrame
,
NULL
,
NULL
);
...
...
vcl/unx/gtk/window/gtksalmenu.cxx
Dosyayı görüntüle @
74eca077
...
@@ -249,12 +249,14 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse )
...
@@ -249,12 +249,14 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse )
{
{
SolarMutexGuard
aGuard
;
SolarMutexGuard
aGuard
;
SAL_INFO
(
"vcl.unity"
,
"ImplUpdate pre PrepUpdate"
);
if
(
!
PrepUpdate
()
)
if
(
!
PrepUpdate
()
)
return
;
return
;
Menu
*
pVCLMenu
=
mpVCLMenu
;
Menu
*
pVCLMenu
=
mpVCLMenu
;
GLOMenu
*
pLOMenu
=
G_LO_MENU
(
mpMenuModel
);
GLOMenu
*
pLOMenu
=
G_LO_MENU
(
mpMenuModel
);
GLOActionGroup
*
pActionGroup
=
G_LO_ACTION_GROUP
(
mpActionGroup
);
GLOActionGroup
*
pActionGroup
=
G_LO_ACTION_GROUP
(
mpActionGroup
);
SAL_INFO
(
"vcl.unity"
,
"Syncing vcl menu "
<<
pVCLMenu
<<
" to menu model "
<<
pLOMenu
<<
" and action group "
<<
pActionGroup
);
GList
*
pOldCommandList
=
NULL
;
GList
*
pOldCommandList
=
NULL
;
GList
*
pNewCommandList
=
NULL
;
GList
*
pNewCommandList
=
NULL
;
...
@@ -348,6 +350,7 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse )
...
@@ -348,6 +350,7 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse )
if
(
bRecurse
)
if
(
bRecurse
)
{
{
SAL_INFO
(
"vcl.unity"
,
"preparing submenu "
<<
pSubMenuModel
<<
" to menu model "
<<
G_MENU_MODEL
(
pSubMenuModel
)
<<
" and action group "
<<
G_ACTION_GROUP
(
pActionGroup
));
pSubmenu
->
SetMenuModel
(
G_MENU_MODEL
(
pSubMenuModel
)
);
pSubmenu
->
SetMenuModel
(
G_MENU_MODEL
(
pSubMenuModel
)
);
pSubmenu
->
SetActionGroup
(
G_ACTION_GROUP
(
pActionGroup
)
);
pSubmenu
->
SetActionGroup
(
G_ACTION_GROUP
(
pActionGroup
)
);
...
@@ -475,6 +478,7 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
...
@@ -475,6 +478,7 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
GLOMenu
*
pMenuModel
=
G_LO_MENU
(
g_object_get_data
(
G_OBJECT
(
gdkWindow
),
"g-lo-menubar"
)
);
GLOMenu
*
pMenuModel
=
G_LO_MENU
(
g_object_get_data
(
G_OBJECT
(
gdkWindow
),
"g-lo-menubar"
)
);
GLOActionGroup
*
pActionGroup
=
G_LO_ACTION_GROUP
(
g_object_get_data
(
G_OBJECT
(
gdkWindow
),
"g-lo-action-group"
)
);
GLOActionGroup
*
pActionGroup
=
G_LO_ACTION_GROUP
(
g_object_get_data
(
G_OBJECT
(
gdkWindow
),
"g-lo-action-group"
)
);
SAL_INFO
(
"vcl.unity"
,
"Found menu model: "
<<
pMenuModel
<<
" and action group: "
<<
pActionGroup
);
if
(
pMenuModel
)
if
(
pMenuModel
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment